Merge pull request #27 from NLipatov/feature/2

Feature/2

Author: NLipatov

.env

@@ -12,12 +12,15 @@ PLANS_DB_PASS=m1E416AwQv0sXsijwcx53o41pk2EXnvd
 PLANS_DB_HOST=plan-postgres
 PLANS_DB_PORT=5432
 
-#LT BILLING DB
-LT_BILLING_DB_USER=admin
-LT_BILLING_DB_PASS=m1E416AwQv0sXsijwcx53o41pk2EXnvd
-LT_BILLING_DB_DATABASE=lt-billing
-LT_BILLING_DB_HOST=lt-billing-postgres
-LT_BILLING_DB_PORT=5432
+#BILLING DB
+BILLING_DB_USER=admin
+BILLING_DB_PASS=m1E416AwQv0sXsijwcx53o41pk2EXnvd
+BILLING_DB_DATABASE=billing
+BILLING_DB_HOST=billing-postgres
+BILLING_DB_PORT=5432
+BILLING_CACHE_HOST=billing-cache
+BILLING_CACHE_PORT=6379
+BILLING_CACHE_USER=default
 
 #TrafficCache
 TC_CACHE_HOST=plan-controller-cache
@@ -40,4 +43,14 @@ GOOGLE_AUTH_PORT=3030
 
 #REST API KAFKA
 USERS_REST_API_KAFKA_GROUP_ID=rest-api
-USERS_REST_API_KAFKA_TOPIC=PROXY
+USERS_REST_API_KAFKA_TOPIC=PROXY
+
+#CRYPTO CLOUD BILLING API
+CC_BILLING_ALLOWED_ORIGINS=http://localhost:5173,http://localhost:2020
+CC_BILLING_KAFKA_AUTO_OFFSET_RESET=earliest
+CC_BILLING_KAFKA_BOOTSTRAP_SERVERS=kafka:9092
+CC_BILLING_KAFKA_GROUP_ID=crypto-cloud-billing
+CC_BILLING_KAFKA_TOPIC=crypto-cloud-billing
+CC_BILLING_SECRET_KEY=secret
+CC_BILLING_SHOP_ID=secret
+CC_BILLING_API_KEY=secret

docker-compose.yml

@@ -38,17 +38,17 @@ services:
       timeout: 5s
       retries: 5
 
-  lt-billing-postgres:
+  billing-postgres:
     image: postgres:17.2-bookworm
     container_name: lavatop-billing-postgres
     environment:
-      POSTGRES_USER: ${LT_BILLING_DB_USER}
-      POSTGRES_PASSWORD: ${LT_BILLING_DB_PASS}
-      POSTGRES_DB: ${LT_BILLING_DB_DATABASE}
+      POSTGRES_USER: ${BILLING_DB_USER}
+      POSTGRES_PASSWORD: ${BILLING_DB_PASS}
+      POSTGRES_DB: ${BILLING_DB_DATABASE}
     ports:
       - "5435:5432"
     volumes:
-      - lt-billing-postgres_data:/var/lib/postgresql/data
+      - billing-postgres_data:/var/lib/postgresql/data
     healthcheck:
       test: [ "CMD-SHELL", "pg_isready -U ${DB_USER}" ]
       interval: 10s
@@ -85,19 +85,19 @@ services:
       plan-postgres:
         condition: service_healthy
 
-  lt-billing-ctx-migrator:
+  billing-ctx-migrator:
     build:
       context: ./src
-    container_name: lt-billing-ctx-migrator
+    container_name: billing-ctx-migrator
     environment:
       - MODE=migrator
-      - DB_DATABASE=${LT_BILLING_DB_DATABASE}
-      - DB_USER=${LT_BILLING_DB_USER}
-      - DB_PASS=${LT_BILLING_DB_PASS}
-      - DB_HOST=${LT_BILLING_DB_HOST}
-      - DB_PORT=${LT_BILLING_DB_PORT}
+      - DB_DATABASE=${BILLING_DB_DATABASE}
+      - DB_USER=${BILLING_DB_USER}
+      - DB_PASS=${BILLING_DB_PASS}
+      - DB_HOST=${BILLING_DB_HOST}
+      - DB_PORT=${BILLING_DB_PORT}
     depends_on:
-      lt-billing-postgres:
+      billing-postgres:
         condition: service_healthy
 
   google-auth-api:
@@ -263,6 +263,99 @@ services:
       timeout: 5s
       retries: 3
       start_period: 5s
+    
+  billing-cache:
+      image: valkey/valkey:8.0-bookworm
+      container_name: billing-cache
+      ports:
+        - "6380:6379"
+      volumes:
+        - billing-cache_data:/data
+      healthcheck:
+        test: ["CMD", "redis-cli", "ping"]
+        interval: 30s
+        timeout: 5s
+        retries: 3
+        start_period: 5s
+        
+  billing-api:
+    build:
+      context: ./src
+    container_name: billing-api
+    ports:
+      - "4040:4040"
+    environment:
+      - MODE=billing-api
+      - HTTP_PORT=4040
+      - ALLOWED_ORIGINS=*
+      - DB_DATABASE=${BILLING_DB_DATABASE}
+      - DB_HOST=${BILLING_DB_HOST}
+      - DB_PASS=${BILLING_DB_PASS}
+      - DB_PORT=${BILLING_DB_PORT}
+      - DB_USER=${BILLING_DB_USER}
+      - TC_CACHE_HOST=${BILLING_CACHE_HOST}
+      - TC_CACHE_PORT=${BILLING_CACHE_PORT}
+      - TC_CACHE_USER=${BILLING_CACHE_USER}
+    depends_on:
+      init-kafka-topics:
+        condition: service_completed_successfully
+      billing-postgres:
+        condition: service_healthy
+      kafka:
+        condition: service_healthy
+      billing-cache:
+        condition: service_healthy
+        
+  plans-api:
+    build:
+      context: ./src
+    container_name: plans-api
+    ports:
+      - "9090:9090"
+    environment:
+      - MODE=plans-api
+      - HTTP_PORT=9090
+      - ALLOWED_ORIGINS=*
+      - DB_DATABASE=${PLANS_DB_DATABASE}
+      - DB_HOST=${PLANS_DB_HOST}
+      - DB_PASS=${PLANS_DB_PASS}
+      - DB_PORT=${PLANS_DB_PORT}
+      - DB_USER=${PLANS_DB_USER}
+      - TC_CACHE_HOST=${TC_CACHE_HOST}
+      - TC_CACHE_PORT=${TC_CACHE_PORT}
+      - TC_CACHE_USER=${TC_CACHE_USER}
+    depends_on:
+      init-kafka-topics:
+        condition: service_completed_successfully
+      kafka:
+        condition: service_healthy
+      plan-controller-cache:
+        condition: service_healthy
+        
+  crypto-cloud-billing-api:
+    build:
+      context: ./src
+    container_name: crypto-cloud-billing-api
+    ports:
+      - "2020:2020"
+    environment:
+      - MODE=crypto-cloud-billing-api
+      - HTTP_PORT=2020
+      - ALLOWED_ORIGINS=${CC_BILLING_ALLOWED_ORIGINS}
+      - BILLING_KAFKA_AUTO_OFFSET_RESET=${CC_BILLING_KAFKA_AUTO_OFFSET_RESET}
+      - BILLING_KAFKA_BOOTSTRAP_SERVERS=${CC_BILLING_KAFKA_BOOTSTRAP_SERVERS}
+      - BILLING_KAFKA_GROUP_ID=${CC_BILLING_KAFKA_GROUP_ID}
+      - BILLING_KAFKA_TOPIC=${CC_BILLING_KAFKA_TOPIC}
+      - API_KEY=${CC_BILLING_API_KEY}
+      - SECRET_KEY=${CC_BILLING_SECRET_KEY}
+      - SHOP_ID=${CC_BILLING_SHOP_ID}
+    depends_on:
+      init-kafka-topics:
+        condition: service_completed_successfully
+      kafka:
+        condition: service_healthy
+      plan-controller-cache:
+        condition: service_healthy
 
   plan-controller:
     build:
@@ -305,5 +398,6 @@ services:
 volumes:
   postgres_data:
   plan-postgres_data: 
-  lt-billing-postgres_data:
+  billing-postgres_data:
   plan-controller-cache_data:
+  billing-cache_data:

src/application/repository.go

@@ -35,6 +35,11 @@ type PlanRepository interface {
 	GetByIdWithFeatures(id int) (aggregates.Plan, error)
 }
 
+type PlanPriceRepository interface {
+	Repository[dataobjects.PlanPrice]
+	GetAllWithPlanId(planId int) ([]dataobjects.PlanPrice, error)
+}
+
 type UserPlanRepository interface {
 	Repository[aggregates.UserPlan]
 	GetUserActivePlan(userId int) (aggregates.UserPlan, error)

src/dal/cache_serialization/price_serializer.go

@@ -0,0 +1,46 @@
+package cache_serialization
+
+import "goproxy/domain/dataobjects"
+
+type PriceDto struct {
+	Id       int
+	PlanId   int
+	Cents    int64
+	Currency string
+}
+
+type PriceCacheSerializer struct {
+}
+
+func NewPriceCacheSerializer() CacheSerializer[dataobjects.PlanPrice, PriceDto] {
+	return &PriceCacheSerializer{}
+}
+
+func (p *PriceCacheSerializer) ToT(dto PriceDto) dataobjects.PlanPrice {
+	return dataobjects.NewPlanPrice(dto.Id, dto.PlanId, dto.Cents, dto.Currency)
+}
+
+func (p *PriceCacheSerializer) ToD(price dataobjects.PlanPrice) PriceDto {
+	return PriceDto{
+		Id:       price.Id(),
+		PlanId:   price.PlanId(),
+		Cents:    price.Cents(),
+		Currency: price.Currency(),
+	}
+}
+
+func (p *PriceCacheSerializer) ToTArray(dto []PriceDto) []dataobjects.PlanPrice {
+	result := make([]dataobjects.PlanPrice, len(dto))
+	for i, d := range dto {
+		result[i] = p.ToT(d)
+	}
+	return result
+}
+
+func (p *PriceCacheSerializer) ToDArray(dto []dataobjects.PlanPrice) []PriceDto {
+	result := make([]PriceDto, len(dto))
+	for i, d := range dto {
+		result[i] = p.ToD(d)
+	}
+	return result
+}

…t-billing/v1_schema_migrations_table.sql …s/billing/v1_schema_migrations_table.sqlsrc/dal/migrations/lt-billing/v1_schema_migrations_table.sql renamed to src/dal/migrations/billing/v1_schema_migrations_table.sql src/dal/migrations/lt-billing/v1_schema_migrations_table.sql renamed to src/dal/migrations/billing/v1_schema_migrations_table.sql

@@ -0,0 +1,10 @@
+CREATE TABLE plan_prices(
+    id SERIAL PRIMARY KEY,
+    plan_id INT NOT NULL,
+    currency VARCHAR(3) NOT NULL,
+    cents BIGINT NOT NULL CHECK (cents >= 0),
+    UNIQUE (plan_id, currency)
+);
+
+CREATE INDEX idx_plan_prices_plan_id on plan_prices(plan_id);
+CREATE INDEX idx_plan_prices_plan_id_currency on plan_prices(plan_id, currency);