working

payment-service/.gitignore

@@ -1 +1 @@
-.env.env
+*.env

payment-service/Dockerfile

@@ -1,15 +1,13 @@
 # First stage: Build the Go binary
 FROM golang:1.22.2-alpine AS builder
 
-# Set the working directory inside the builder stage
+
 WORKDIR /app
 
-# Copy go.mod and go.sum to cache dependencies
 COPY go.mod ./
 COPY go.sum ./
 RUN go mod download
 
-# Copy the rest of the application files
 COPY . .
 
 # Build the Go app as a statically linked binary
@@ -24,8 +22,6 @@ WORKDIR /root/
 # Copy the Go binary from the builder stage
 COPY --from=builder /app/main .
 
-# Expose port 8082
 EXPOSE 8082
 
-# Run the Go binary
 CMD ["./main"]

payment-service/docker-compose.yml

@@ -1,14 +1,16 @@
 services:
   mongo:
-    container_name: mongo
+    container_name: mongo-payment
     image: mongo:latest
     restart: always
     ports:
-      - "27019:27017"
+      - "27017:27017"
 
   goapp:
     build: .
-    container_name: goapp
+    container_name: goapp-payment
+    env_file:
+      - .env
     ports:
       - "8082:8082"
     depends_on:

payment-service/internal/data/data.go

@@ -27,7 +27,7 @@ func (p *PaymentData) SavePayment(ctx context.Context, payment *model.Payment) e
 func (p *PaymentData) GetPaymentById(ctx context.Context, id primitive.ObjectID) (*model.Payment, error) {
 
 	var payment *model.Payment
-	err := p.Collection.FindOne(ctx, bson.M{"id": id}).Decode(&payment)
+	err := p.Collection.FindOne(ctx, bson.M{"_id": id}).Decode(&payment)
 	if err != nil {
 		return nil, err
 	}

payment-service/internal/service/service.go

@@ -8,20 +8,11 @@ import (
 	"os"
 	"time"
 
-	"github.com/joho/godotenv"
 	"github.com/stripe/stripe-go"
 	"github.com/stripe/stripe-go/paymentintent"
 	"go.mongodb.org/mongo-driver/bson/primitive"
 )
 
-// load env variables
-func init() {
-	err := godotenv.Load()
-	if err != nil {
-		log.Fatal("Error loading .env file")
-	}
-}
-
 type PaymentService struct {
 	paymentData *data.PaymentData
 }
@@ -37,8 +28,12 @@ func (ps *PaymentService) ProcessPayment(ctx context.Context, payment *model.Pay
 	payment.CreatedAt = time.Now()
 	payment.UpdatedAt = time.Now()
 
+	STRIPE_API := os.Getenv("STRIPE_API")
+	if STRIPE_API == "" {
+		log.Fatal("failed to get stripe api env")
+	}
 	// 	stripe api client
-	stripe.Key = os.Getenv("STRIPE_API")
+	stripe.Key = STRIPE_API
 
 	// Creating a stripe payment intent
 	params := &stripe.PaymentIntentParams{