ci: remove from prod deployment staging push trigger

.gitea/workflows/deployProd.yml

@@ -0,0 +1,23 @@
+name: Deploy
+run-name: ${{ gitea.actor }} build image and push to container registry
+
+on: 
+  push:
+    branches:
+      - 'main'
+
+jobs:
+  CreateImage:
+    runs-on: [hubstaging]
+    uses: http://gitea.pena/PenaDevops/actions.git/.gitea/workflows/build-image.yml@v1.1.6-p
+    with:
+      runner: hubstaging
+    secrets:
+      REGISTRY_USER: ${{ secrets.REGISTRY_USER }}
+      REGISTRY_PASSWORD: ${{ secrets.REGISTRY_PASSWORD }}
+  DeployService:
+    runs-on: [hubprod]
+    needs: CreateImage
+    uses: http://gitea.pena/PenaDevops/actions.git/.gitea/workflows/deploy.yml@v1.1.4-p7
+    with:
+      runner: hubprod

Dockerfile

@@ -1,4 +1,4 @@
-FROM gitea.pena/penadevops/container-images/golang:main as build
+FROM gitea.pena/penadevops/container-images/golang:1.23.8-alpine as build
 WORKDIR /app
 ENV GOPRIVATE=gitea.pena/PenaSide/common,gitea.pena/PenaSide/linters-golang,gitea.pena/PenaSide/customer,gitea.pena/PenaSide/trashlog,gitea.pena/PenaSide/hlog
 ENV GOINSECURE=gitea.pena/PenaSide/common,gitea.pena/PenaSide/linters-golang,gitea.pena/PenaSide/customer,gitea.pena/PenaSide/trashlog,gitea.pena/PenaSide/hlog

deployments/main/docker-compose.yaml

@@ -1,24 +1,18 @@
-version: "3.3"
-
 services:
   admin:
-    container_name: hub-admin-backend-service
     restart: unless-stopped
     tty: true
-    image: $CI_REGISTRY_IMAGE/main:$CI_COMMIT_REF_SLUG.$CI_PIPELINE_ID
+    image: gitea.pena/penaside/tariffs/main:$GITHUB_RUN_NUMBER
     ports: 
-      - 10.8.0.8:59303:8005
-    networks:
-      - default
+      - 10.8.0.226:59303:8005
+      - 10.8.0.226:59304:8006
     environment:
-      - DB_HOST=10.8.0.8
-      - DB_PORT=27017
-      - ENVIRONMENT=staging
-      - HTTP_HOST=0.0.0.0
-      - HTTP_PORT=8005
-      - AUTH_SERVICE_HOST=http://10.8.0.8
-      - AUTH_SERVICE_PORT=59300
-      - DB_USERNAME=$DB_USERNAME-prod
-      - DB_PASSWORD=$DB_PASSWORD
-      - DB_NAME=administrator
-      - PUBLIC_ACCESS_SECRET_KEY=$PUBLIC_ACCESS_SECRET_KEY
+      MONGO_URL: mongodb://administrator-prod:64143ffdd9304865586e5cf1@10.8.0.226:27017/administrator?authSource=administrator
+      MONGO_DB_NAME: administrator
+      ENVIRONMENT: production
+      INTERNAL_HTTP_ADDRESS: 0.0.0.0:8006
+      EXTERNAL_HTTP_ADDRESS: 0.0.0.0:8005
+      AUTH_SERVICE_HOST: http://10.8.0.226
+      AUTH_SERVICE_PORT: 59300
+      JWT_PUBLIC_KEY: "-----BEGIN PUBLIC KEY-----\nMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCLW1tlHyKC9AG0hGpmkksET2DE\nr7ojSPemxFWAgFgcPJWQ7x3uNbsdJ3bIZFoA/FClaWKMCZmjnH9tv0bKZtY/CDhM\nZEyHpMruRSn6IKrxjtQZWy4uv/w6MzUeyBYG0OvNCiYpdvz5SkAGAUHD5ZNFqn2w\nKKFD0I2Dr59BFVSGJwIDAQAB\n-----END PUBLIC KEY-----"
+      PUBLIC_ACCESS_SECRET_KEY: "-----BEGIN PUBLIC KEY-----\nMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCLW1tlHyKC9AG0hGpmkksET2DE\nr7ojSPemxFWAgFgcPJWQ7x3uNbsdJ3bIZFoA/FClaWKMCZmjnH9tv0bKZtY/CDhM\nZEyHpMruRSn6IKrxjtQZWy4uv/w6MzUeyBYG0OvNCiYpdvz5SkAGAUHD5ZNFqn2w\nKKFD0I2Dr59BFVSGJwIDAQAB\n-----END PUBLIC KEY-----"

internal/controller/tariff_internal/route.go

@@ -3,8 +3,8 @@ package tariff_internal
 import "github.com/gofiber/fiber/v2"
 
 func (t *TariffInternal) Register(router fiber.Router) {
-	router.Get("/:id", t.Get)
 	router.Get("/getList", t.GetList)
+	router.Get("/:id", t.Get)
 	router.Post("/", t.Create)
 	router.Delete("/", t.Delete)
 	router.Put("/:id", t.Update)

internal/repository/tariff/tariff.go

@@ -160,18 +160,21 @@ func (t *Tariff) Update(ctx context.Context, tariffID primitive.ObjectID, req mo
 	for i, privilege := range req.Privileges {
 		origPrivilege := privilegeMap[privilege.PrivilegeID]
 		clean[i] = models.Privilege{
+      ID:          origPrivilege.ID,
 			Name:        origPrivilege.Name,
 			PrivilegeID: origPrivilege.PrivilegeID,
 			ServiceKey:  origPrivilege.ServiceKey,
 			Description: origPrivilege.Description,
 			Type:        origPrivilege.Type,
 			Value:       origPrivilege.Value,
+      Amount:      privilege.Amount,
 			Price:       origPrivilege.Price,
 		}
 	}
 
 	update := bson.M{
 		"$set": bson.M{
+      "description": req.Description,
 			"order":      req.Order,
 			"name":       req.Name,
 			"price":      req.Price,