Merge branch 'staging'

deployments/staging/docker-compose.yaml

@@ -22,27 +22,15 @@ services:
       - YOOMONEY_WEBHOOKS_URL=http://treasurer-mock-staging:8080/webhooks
       - YOOMONEY_PAYMENTS_URL=https://api.yookassa.ru/v3/payments
 
-      - MONGO_HOST=10.6.0.11
+      - MONGO_HOST=10.8.0.6
       - MONGO_PORT=27017
       - MONGO_USER=$MONGO_USER
       - MONGO_PASSWORD=$MONGO_PASSWORD
       - MONGO_DB_NAME=treasurer
       - MONGO_AUTH=treasurer
     ports:
-      - 8085:8085
-      - 9085:9085
-    networks:
-      - backend_external
-      - default
-    depends_on:
-      - treasurer-mock-staging
-  treasurer-mock-staging:
-    hostname: treasurer-mock-staging
-    container_name: treasurermock-container-staging
-    image: 'wiremock/wiremock:2.35.0'
-    tty: true
-    ports:
-      - 8080:8080
+      - 10.8.0.6:8085:8085
+      - 10.8.0.6:9085:9085
     networks:
       - backend_external
       - default

internal/models/yandex/payment_create.go

@@ -23,7 +23,7 @@ type Item struct {
 	Description string `json:"description,omitempty"`
 	Amount ReceiptAmount `json:"amount,omitempty"`
 	VatCode int `json:"vat_code,omitempty"`
-	Quantity string `json:"quantity,omitempty"`
+	Quantity int64 `json:"quantity,omitempty"`
 	Measure string `json:"measure,omitempty"`
 	PaymentSubject string `json:"payment_subject,omitempty"`
 	PaymentMode string `json:"payment_mode,omitempty"`

internal/utils/yoomoney.go

@@ -24,7 +24,7 @@ func ProtoItem2ReceiptItem(in *treasurer.Item) yandex.Item {
 			Currency: in.Currency,
 		},
 		VatCode: 1,
-		Quantity: in.Quantity,
+		Quantity: 1,
 		Measure: in.Measure,
 		PaymentSubject: "service",
 		PaymentMode: "full_prepayment",