Merge branch 'release/v1.7.0'

dwarvesf · Aug 7, 2024 · 00fcdcc · 00fcdcc
2 parents 5c4aba6 + 600cb7d
commit 00fcdcc
Show file tree

Hide file tree

Showing 10 changed files with 199 additions and 293 deletions.
diff --git a/.github/workflows/gke-dev.yml b/.github/workflows/gke-dev.yml
@@ -55,7 +55,7 @@ jobs:
           ref: main
       - name: Update api version
         run: |
-          cd ./infrastructure/fortress-api/$K8S_ENVIRONMENT
+          cd ./infrastructure/fortress/fortress-api/$K8S_ENVIRONMENT
           git config user.name lmquang
           git config user.email [email protected]
           /tmp/kustomize edit set image $REGISTRY_HOSTNAME/$GKE_PROJECT/$IMAGE=$REGISTRY_HOSTNAME/$GKE_PROJECT/$IMAGE:${GITHUB_SHA}

diff --git a/.github/workflows/gke-prod.yml b/.github/workflows/gke-prod.yml
@@ -53,7 +53,7 @@ jobs:
           ref: main
       - name: Update api version
         run: |
-          cd ./infrastructure/fortress-api/$K8S_ENVIRONMENT
+          cd ./infrastructure/fortress/fortress-api/$K8S_ENVIRONMENT
           git config user.name lmquang
           git config user.email [email protected]
           /tmp/kustomize edit set image $REGISTRY_HOSTNAME/$GKE_PROJECT/$IMAGE=$REGISTRY_HOSTNAME/$GKE_PROJECT/$IMAGE:${GITHUB_REF_NAME}

diff --git a/docs/docs.go b/docs/docs.go
@@ -753,7 +753,7 @@ const docTemplate = `{
                     "200": {
                         "description": "OK",
                         "schema": {
-                            "$ref": "#/definitions/github_com_dwarvesf_fortress-api_pkg_view.GetListCompanyInfoResponse"
+                            "$ref": "#/definitions/GetListCompanyInfoResponse"
                         }
                     },
                     "500": {
@@ -7087,6 +7087,17 @@ const docTemplate = `{
                 }
             }
         },
+        "Attribute": {
+            "type": "object",
+            "properties": {
+                "trait_type": {
+                    "type": "string"
+                },
+                "value": {
+                    "type": "string"
+                }
+            }
+        },
         "Audit": {
             "type": "object",
             "properties": {
@@ -7454,17 +7465,11 @@ const docTemplate = `{
         "BasicCompanyInfo": {
             "type": "object",
             "properties": {
-                "description": {
-                    "type": "string"
-                },
                 "id": {
                     "type": "string"
                 },
                 "name": {
                     "type": "string"
-                },
-                "registrationNumber": {
-                    "type": "string"
                 }
             }
         },
@@ -8455,6 +8460,32 @@ const docTemplate = `{
                 }
             }
         },
+        "Earn": {
+            "type": "object",
+            "properties": {
+                "bounty": {
+                    "type": "string"
+                },
+                "function": {
+                    "type": "string"
+                },
+                "pics": {
+                    "type": "array",
+                    "items": {
+                        "type": "string"
+                    }
+                },
+                "status": {
+                    "type": "string"
+                },
+                "title": {
+                    "type": "string"
+                },
+                "url": {
+                    "type": "string"
+                }
+            }
+        },
         "EmployeeAddress": {
             "type": "object",
             "properties": {
@@ -8620,11 +8651,7 @@ const docTemplate = `{
                 },
                 "status": {
                     "description": "working info",
-                    "allOf": [
-                        {
-                            "$ref": "#/definitions/WorkingStatus"
-                        }
-                    ]
+                    "type": "string"
                 },
                 "teamEmail": {
                     "type": "string"
@@ -9174,6 +9201,17 @@ const docTemplate = `{
                 }
             }
         },
+        "GetListCompanyInfoResponse": {
+            "type": "object",
+            "properties": {
+                "data": {
+                    "type": "array",
+                    "items": {
+                        "$ref": "#/definitions/CompanyInfo"
+                    }
+                }
+            }
+        },
         "GetListEmployeeQuery": {
             "type": "object",
             "properties": {
@@ -9675,7 +9713,7 @@ const docTemplate = `{
                 "earns": {
                     "type": "array",
                     "items": {
-                        "$ref": "#/definitions/github_com_dwarvesf_fortress-api_pkg_view.Earn"
+                        "$ref": "#/definitions/Earn"
                     }
                 }
             }
@@ -10025,7 +10063,7 @@ const docTemplate = `{
                 "attributes": {
                     "type": "array",
                     "items": {
-                        "$ref": "#/definitions/pkg_view.attribute"
+                        "$ref": "#/definitions/Attribute"
                     }
                 },
                 "background_color": {
@@ -12667,7 +12705,7 @@ const docTemplate = `{
             "type": "object",
             "properties": {
                 "employeeStatus": {
-                    "$ref": "#/definitions/WorkingStatus"
+                    "type": "string"
                 }
             }
         },
@@ -13136,23 +13174,6 @@ const docTemplate = `{
                 "WorkUnitTypeLearning"
             ]
         },
-        "WorkingStatus": {
-            "type": "string",
-            "enum": [
-                "on-boarding",
-                "left",
-                "probation",
-                "full-time",
-                "contractor"
-            ],
-            "x-enum-varnames": [
-                "WorkingStatusOnBoarding",
-                "WorkingStatusLeft",
-                "WorkingStatusProbation",
-                "WorkingStatusFullTime",
-                "WorkingStatusContractor"
-            ]
-        },
         "github_com_dwarvesf_fortress-api_pkg_model.SortOrder": {
             "type": "string",
             "enum": [
@@ -13164,43 +13185,6 @@ const docTemplate = `{
                 "SortOrderDESC"
             ]
         },
-        "github_com_dwarvesf_fortress-api_pkg_view.Earn": {
-            "type": "object",
-            "properties": {
-                "bounty": {
-                    "type": "string"
-                },
-                "function": {
-                    "type": "string"
-                },
-                "pics": {
-                    "type": "array",
-                    "items": {
-                        "type": "string"
-                    }
-                },
-                "status": {
-                    "type": "string"
-                },
-                "title": {
-                    "type": "string"
-                },
-                "url": {
-                    "type": "string"
-                }
-            }
-        },
-        "github_com_dwarvesf_fortress-api_pkg_view.GetListCompanyInfoResponse": {
-            "type": "object",
-            "properties": {
-                "data": {
-                    "type": "array",
-                    "items": {
-                        "$ref": "#/definitions/CompanyInfo"
-                    }
-                }
-            }
-        },
         "pkg_view.DiscordResearchTopic": {
             "type": "object",
             "properties": {
@@ -13231,17 +13215,6 @@ const docTemplate = `{
                     "type": "string"
                 }
             }
-        },
-        "pkg_view.attribute": {
-            "type": "object",
-            "properties": {
-                "trait_type": {
-                    "type": "string"
-                },
-                "value": {
-                    "type": "string"
-                }
-            }
         }
     },
     "securityDefinitions": {