diff --git a/Dockerfile b/Dockerfile index 1386d87..84854a9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,7 @@ FROM penahub.gitlab.yandexcloud.net:5050/devops/dockerhub-backup/golang as build WORKDIR /app COPY . . +RUN apk add git ENV GOPRIVATE=penahub.gitlab.yandexcloud.net/backend/penahub_common RUN git config --global url."https://buildToken:glpat-axA8ttckx3aPf_xd2Dym@penahub.gitlab.yandexcloud.net/".insteadOf "https://penahub.gitlab.yandexcloud.net/" RUN go mod download diff --git a/deployments/staging/docker-compose.yaml b/deployments/staging/docker-compose.yaml index f7751ed..8d55b77 100644 --- a/deployments/staging/docker-compose.yaml +++ b/deployments/staging/docker-compose.yaml @@ -24,7 +24,7 @@ services: SMTP_USERNAME: 'kotilion.95@gmail.com' SMTP_PASSWORD: 'vWwbCSg4bf0p' SMTP_API_KEY: 'P0YsjUB137upXrr1NiJefHmXVKW1hmBWlpev' - CUSTOMER_SERVICE_ADDRESS: 'http://10.8.0.6:8065/' + CUSTOMER_SERVICE_ADDRESS: '10.8.0.6:8066' MINIO_EP: s3.timeweb.cloud MINIO_AK: 5CV77KVDUU9H0II9R24M MINIO_SK: 0W0m8DyvdAKRJnsAy6mB5zndQ7RouJBLhqhtThcu diff --git a/go.mod b/go.mod index ede4461..dde7267 100644 --- a/go.mod +++ b/go.mod @@ -16,7 +16,7 @@ require ( golang.org/x/net v0.25.0 google.golang.org/grpc v1.64.0 google.golang.org/protobuf v1.34.1 - penahub.gitlab.yandexcloud.net/backend/quiz/common.git v0.0.0-20240617151847-e1322a679dd1 + penahub.gitlab.yandexcloud.net/backend/quiz/common.git v0.0.0-20240617173955-a34278088ddd ) diff --git a/go.sum b/go.sum index 8fa9ab7..e7ad648 100644 --- a/go.sum +++ b/go.sum @@ -159,3 +159,5 @@ penahub.gitlab.yandexcloud.net/backend/penahub_common v0.0.0-20240527160654-bd1c penahub.gitlab.yandexcloud.net/backend/penahub_common v0.0.0-20240527160654-bd1c2126bc6c/go.mod h1:lTmpjry+8evVkXWbEC+WMOELcFkRD1lFMc7J09mOndM= penahub.gitlab.yandexcloud.net/backend/quiz/common.git v0.0.0-20240617151847-e1322a679dd1 h1:KCQf7PmSq63YemEF5s81f7lXsewWFQjIr0IeIWxzBVo= penahub.gitlab.yandexcloud.net/backend/quiz/common.git v0.0.0-20240617151847-e1322a679dd1/go.mod h1:n66zm88Dh12+idyfqh0vU5nd9BZYxM6Pv0XYnmy0398= +penahub.gitlab.yandexcloud.net/backend/quiz/common.git v0.0.0-20240617173955-a34278088ddd h1:/FW9GjEbxXWD5/e3oUGn4iKihhc77FvfDPnVqL1SQvM= +penahub.gitlab.yandexcloud.net/backend/quiz/common.git v0.0.0-20240617173955-a34278088ddd/go.mod h1:n66zm88Dh12+idyfqh0vU5nd9BZYxM6Pv0XYnmy0398= diff --git a/privilegewc/check.go b/privilegewc/check.go index c2fd482..291c1f6 100644 --- a/privilegewc/check.go +++ b/privilegewc/check.go @@ -58,7 +58,7 @@ func (w *CheckWorker) deleteExpired(ctx context.Context) { } for _, data := range expiredData { - err := w.privilegeDAL.AccountRepo.DeletePrivilegeByID(ctx, data.ID) + err := w.privilegeDAL.AccountRepo.DeletePrivilegeByID(ctx, data.Privilege.ID) if err != nil { w.config.Logger.Module("Error deleting expired quizUnlimTime record") w.config.ErrChan <- err diff --git a/tools/migrate b/tools/migrate new file mode 100755 index 0000000..573af5c Binary files /dev/null and b/tools/migrate differ