fix

.github/workflows/flow.yaml

@@ -0,0 +1,63 @@
+name: SparkIt build
+on:
+  push:
+    branches:
+      - main
+      - final
+
+jobs:
+  linters-act:
+    name: linters
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-go@v5
+        with:
+          go-version: '1.21'
+      - name: golangci-lint
+        uses: golangci/golangci-lint-action@v4
+  tests-act:
+    name: tests
+    needs: linters-act
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: Set up Go
+        uses: actions/setup-go@v5
+        with:
+          go-version: '1.21'
+      - name: ImageData
+        run: cd /home/runner && mkdir imagedata
+      - name: Build
+        run: go build -v ./...
+      - name: Test
+        run: go test -v ./...
+
+  deploy:
+    name: Deploy SparkIt
+    needs: tests-act
+    runs-on: ubuntu-latest
+    steps:
+      - name: Pull Code
+        uses: appleboy/ssh-action@master
+        with:
+          host: ${{ secrets.HOST }}
+          username: ${{ secrets.USERNAME}}
+          key: ${{ secrets.PRIVATE_KEY }}
+          script: cd /home/ubuntu/2024_2_SaraFun/ && git pull
+      - name: Build containers
+        uses: appleboy/ssh-action@master
+        with:
+          timeout: 10m
+          host: ${{ secrets.HOST }}
+          username: ubuntu
+          key: ${{ secrets.PRIVATE_KEY }}
+          script: cd /home/ubuntu/2024_2_SaraFun/ && make sparkit-run
+      - name: Restart service
+        uses: appleboy/ssh-action@master
+        with:
+          host: ${{ secrets.HOST }}
+          username: ubuntu
+          key: ${{ secrets.PRIVATE_KEY }}
+          script: cd /home/ubuntu/2024_2_SaraFun/ && make sparkit-down && make sparkit-run
+

.gitignore

@@ -1 +1,7 @@
-.idea/
+.idea/
+server.crt
+server.key
+coverage.out
+coverprofile.tmp
+.env
+docker/.env

.golangci.yaml

@@ -0,0 +1,15 @@
+linters-settings:
+  gocognit:
+    min-complexity: 60
+
+linters:
+  disable-all: true
+  enable:
+    - govet
+    - gosimple
+    - bodyclose
+    - noctx
+    - errcheck
+    - gocognit
+    - goconst
+    - gofmt

Makefile

@@ -5,6 +5,7 @@ COMMUNICATIONS_BINARY=communications
 DOCKER_DIR=docker
 MESSAGE_BINARY=message
 SURVEY_BINARY=survey
+PAYMENTS_BINARY=payments
 
 build-sparkit:
 	go build -o ${SERVER_BINARY} ./cmd/main
@@ -13,6 +14,12 @@ build-sparkit:
 service-sparkit-image:
 	docker build -t sparkit-service -f ${DOCKER_DIR}/sparkit.Dockerfile .
 
+echo:
+	echo "123"
+
+echo2: echo
+	echo "321"
+
 .PHONY: builder-image
 builder-image:
 	docker build -t sparkit-builder -f ${DOCKER_DIR}/builder.Dockerfile .
@@ -31,6 +38,7 @@ sparkit-run:
 	make service-message-image
 	#make survey-builder-image
 	make service-survey-image
+	make service-payments-image
 	docker-compose -f $(DOCKER_DIR)/docker-compose.yml up -d
 
 .PHONY: sparkit-down
@@ -39,7 +47,11 @@ sparkit-down:
 
 .PHONY: sparkit-test
 sparkit-test:
-	go test -coverprofile=coverage.out -coverpkg=$(go list ./... | grep -v "/mocks" | paste -sd ',') ./...
+	go test -json ./... -coverprofile coverprofile_.tmp -coverpkg=./... ; \
+        grep -v -e '/mocks' -e 'mock_repository.go' -e 'mock.go' -e 'docs.go' -e '_easyjson.go' -e '.pb.go' -e 'gen.go' -e 'main.go' coverprofile_.tmp > coverprofile.tmp ; \
+        rm coverprofile_.tmp ; \
+        go tool cover -html coverprofile.tmp -o ../heatmap.html; \
+        go tool cover -func coverprofile.tmp
 
 .PHONY: sparkit-test-cover
 sparkit-test-cover:
@@ -143,4 +155,23 @@ survey-builder-image:
 sparkit-survey-run:
 	make survey-builder-image
 	make service-survey-image
-	docker run sparkit-survey-service
+	docker run sparkit-survey-service
+
+# docker build for payments microservice
+
+build-payments-microservice:
+	go build -o ${PAYMENTS_BINARY} ./cmd/payments
+
+.PHONY: service-payments-image
+service-payments-image:
+	docker build -t sparkit-payments-service -f ${DOCKER_DIR}/payments.Dockerfile .
+
+.PHONY: payments-builder-image
+payments-builder-image:
+	docker build -t sparkit-payments-builder -f ${DOCKER_DIR}/paymentsBuilder.Dockerfile .
+
+.PHONY: sparkit-payments-run
+sparkit-payments-run:
+	make payments-builder-image
+	make service-payments-image
+	docker run sparkit-payments-service

build/sql/db/configuration/custom.conf

@@ -0,0 +1,22 @@
+listen_addresses = 'sparkit-postgres'
+max_connections = 100
+statement_timeout = '30s'
+lock_timeout = '5s'
+log_destination = 'csvlog'
+logging_collector = on
+log_directory = 'pg_log'
+log_filename = 'postgresql-%Y-%m-%d_%H%M%S.log'
+log_min_duration_statement = 1000
+log_statement = 'none'
+log_line_prefix = '%m [%p]: [%l-1] user=%u,db=%d,client=%h '
+log_error_verbosity = default
+log_min_error_statement = error
+shared_preload_libraries = 'pg_stat_statements, auto_explain'
+pg_stat_statements.max = 10000
+pg_stat_statements.track = all
+pg_stat_statements.track_utility = on
+auto_explain.log_min_duration = '1000ms'
+auto_explain.log_analyze = on
+auto_explain.log_buffers = on
+auto_explain.log_timing = on
+auto_explain.log_triggers = on