Develop

.dockerignore

@@ -0,0 +1,2 @@
+**/Dockerfile*
+**/.dockerignore

.env

@@ -1,8 +1,21 @@
-SECRET = "MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQCDjuCEWb5ciNQS2RCkAWN5YkR5og31NcKoaGhfH6hZo+X0JVaXkiEyHQ3Cj7LxBYIjYF3k86r3gghVKLkc0aZX4gINHVGJABnAime3uQqzC09wZQedbhFVTW1vi/mFED01bprmapfsKA49LkJAuGpiQlfZw+EXyLYBTF04bxiCrw2Ampg9X1ub9c1MHvhIwdqZMbQQdHpimtoXoDZ8HMEyCClpd1OLudomBuav6fSZUz/RMBM5xMfHRnuCmsCciB86hxDOBVhw75qbwKN0cHlnvrrndZ9hMlRp9oZFXYTDwFO2hCOlW8Gx7l60WyNYW5ino6HaA2hmxrTOqOJPya+/AgMBAAECggEANF3gIu6yJpVUjXgX9qCS3xNtnFkUY0IWDQEaYprwYVYrR6bBNC43xoHoI0Ud/nCp37kRRvxzVnhNJtDB9qXBKARPurar6PPATHMLXAdtKd3briqZAGJ6xdC/OgKmvP+8zZMMV6GgfaFoIZRTTP3bYudznrwo0lXTlOq3xKn8QLAm7diFMwRpRkNZTaHWCbFc6y61ChU6b9BhZOk6OSN/z5rMwWFPN2mocEcXFOU09h2RKdSI9dkXp/Wi7IcqOmtDyyUqgAkiLbCi/GNkrub7fBQGY1r8WnZS04nNrNvA4LQ/nN0hGXKwYkaCA1JagVt4vwVfeBREzvgxxVJL/o78CQKBgQDdSvf9geM5hRkvONSintiD6EydX0kmVdp0z50ghaZmJUMEK4cWk9LCgf4NOleixu/cWmTA/jsGYcWpaRCaN35toLO8aoIC+whDtUWaF15PVIrciHLJO6WTMYUr508E2VR1FljOxvqL5TCKDtctvsypq8Ys8elH3MXwUbQhvUAAjQKBgQCYMQI5lcaxHyDYCvUed+sjZrg9VsayjTgvS54EYi0PfH+f2QcHVN2QqMJn61khBt/eIuw6Miz5tG3ItPFFTQeXdEU09GaCkHXXgOs7RWyUmRSoX+F74R/um8HW+Gz8INC6ULafQfyqII7hg3MpIeUc8dCnwTvs3p+KLB0A3GIcewKBgGyppG56Ok6DWeODP35/C4hyKDTaljvZyoSzcc+HcTcVMvw4N4RRoBtc45gxPtkyYJPOW00dSXSPzBSs/7cKau2ADOIHVsIJ7Hv65iuNMAU6WVmDMwI3ZM2Lcn4lffq+kSdRitg2gs7xAs24DddrqmnibFSjkU51TUj9hbtPh779AoGAcS2ZCvvwO837Xc6gRN1HFxePkcYTk7rjeoCQbZAZFHgwbM43pOMetjJaCHAD40S6fPaZmBmySqw8LFMrTa8gIyiLQvsxtIz7pZyw0m4pdkR1EVXkWHytg4N/Xn92hPVeZAAcH0kyPc5ikyBvJrqXKLRHyEkyaE+Sc22kz/wUVjsCgYB/Z1Jln6kLqdAoF9H7x7dB07BeMzpgawGGTxvS36+tD1x1zvE0x3rOMqhjbR2XH+ciVaVc6Z36wEz6cIn/FRABUuF3/89kts5/1b1JcQ2GjO5bXidALBUFyJlolA6pNaP1JNYpdULwu/vBGUeq0a4uGNRYUwuZp+qvoW3Nt22Mug=="
-DB_NAME=Hamster
-DB_USER=kosmatoff
+SECRET="vzqqEH6o5so_VGJZoLhrfdrH7Y7kvFe-7N2i3I3w314=п"
+
+DB_CONTAINER_NAME=HammyWallet_DB
+DB_NAME=HammyWallets
+DB_USER=hamster
 DB_PASSWORD=2003
 DB_HOST=0.0.0.0
+DB_SSLMODE=disable
+DB_PORT=5432
+
+SERVER_NAME=HammyWallet_API
 SERVER_HOST=127.0.0.1
 SERVER_PORT=8080
-DB_SSLMODE=disable
+
+FRONTEND_IP=84.23.52.156
+FRONTEND_PORT=8000
+
+REDIS_CONTAINER_NAME=HammyWallet_redis
+REDIS_HOST=0.0.0.0
+REDIS_PORT=6379
+

.github/workflows/CD.yaml

@@ -0,0 +1,13 @@
+name: CD
+
+on:
+  push:
+    branches:
+      - main
+      - deploy
+  pull_request:
+    branches:
+      - main
+      - deploy
+
+jobs:

.github/workflows/CI.yaml

@@ -0,0 +1,55 @@
+name: CI
+
+on: [push, pull_request]
+
+jobs:
+  linter:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+
+      - name: Setup Go
+        uses: actions/setup-go@v3
+        with:
+          go-version: '1.21'
+
+      - name: Cache Go modules
+        uses: actions/cache@v3
+        id: go-cache
+        with:
+          path: ~/go/pkg/mod
+          key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
+          restore-keys: ${{ runner.os }}-go-
+
+      - if: steps.go-cache.outputs.cache-hit != 'true'
+        run: go mod download
+
+      - name: Create test folder
+        run: |
+          sudo mkdir /images  
+          sudo chmod -R 777 /images
+
+      - name: Run Unit tests
+        run: |
+          go test ./...
+
+      - name: Verify dependencies
+        run: go mod verify
+
+  test:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+
+      - name: Setup Go
+        uses: actions/setup-go@v3
+        with:
+          go-version: '1.21'
+
+      - name: Install dependencies
+        run: go mod tidy
+
+      - name: Run tests
+        run: go test -race -vet=off -run '!(ws|server)' ./...

.github/workflows/config.yaml

@@ -0,0 +1,136 @@
+#name: ci
+#
+#on:
+#  push:
+#    branches:
+#      - develop
+#      - main
+#  pull_request:
+#
+#env:
+#  REGISTRY: "mrdjeb"
+#  IMAGE_NAME: "zuzu-main-web"
+#  CONTAINER_NAME: "zuzu-main"
+#  FOLDER_COMPOSE: "zuzu-main-deploy"
+#  GITHUB_SHA_SHORT:
+#
+#
+jobs:
+  lint_and_test:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Setup Go
+        uses: actions/setup-go@v4
+        with:
+          go-version: '1.21.x'
+          cache: false
+
+      - name: golangci-lint
+        uses: golangci/golangci-lint-action@v3
+
+      - name: Test with the Go CLI
+        run: go test ./...
+
+#  build_and_push:
+#    runs-on: ubuntu-latest
+#    needs: lint_and_test
+#
+#    steps:
+#      - name: Checkout
+#        uses: actions/checkout@v4
+#
+#      - name: Set up QEMU
+#        uses: docker/setup-qemu-action@v2
+#
+#      - name: Set up Docker Buildx
+#        uses: docker/setup-buildx-action@v2
+#
+#      - name: Login to DockerHub
+#        uses: docker/login-action@v2
+#        with:
+#          username: ${{ secrets.DOCKERHUB_USERNAME }}
+#          password: ${{ secrets.DOCKERHUB_TOKEN }}
+#
+#      - name: Set env
+#        run: echo "GITHUB_SHA_SHORT=$(echo $GITHUB_SHA | head -c 8)" >> $GITHUB_ENV
+#
+#      - name: Build and push
+#        uses: docker/build-push-action@v4
+#        with:
+#          context: .
+#          push: true
+#          tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ env.GITHUB_SHA_SHORT }}, ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest
+#          file: ./build/Dockerfile.multistage.main
+#          build-args: |
+#              IMAGE_NAME=${{ env.IMAGE_NAME }}
+#              REGISTRY=${{ env.REGISTRY }}
+#              GITHUB_SHA_SHORT=${{ env.GITHUB_SHA_SHORT }}
+#
+#  deploy:
+#    runs-on: ubuntu-latest
+#    needs: build_and_push
+#
+#    steps:
+#      - name: Checkout
+#        uses: actions/checkout@v3
+#
+#      - name: Deploy docker-compose.yml via SSH action
+#        uses: appleboy/[email protected]
+#        with:
+#          host: ${{ secrets.HOST }}
+#          port: ${{ secrets.PORT }}
+#          username: ${{ secrets.USERNAME }}
+#          key: ${{ secrets.SSHKEY }}
+#          rm: true
+#          source: docker-compose.yaml, build/sql/create.sql
+#          target: ~/${{ env.FOLDER_COMPOSE }}
+#
+#
+#      - name: Deploy to DockerHub via SSH action
+#        uses: appleboy/[email protected]
+#        with:
+#          host: ${{ secrets.HOST }}
+#          port: ${{ secrets.PORT }}
+#          username: ${{ secrets.USERNAME }}
+#          key: ${{ secrets.SSHKEY }}
+#          envs: REGISTRY, IMAGE_NAME, CONTAINER_NAME, GITHUB_SHA, FOLDER_COMPOSE
+#          script: |
+#            sudo bash
+#            cd $(echo $FOLDER_COMPOSE)
+#
+#            # Make .env variables file
+#            cat <<EOF>.env
+#
+#            POSTGRES_DB=${{ secrets.POSTGRES_DB }}
+#            POSTGRES_PASSWORD=${{ secrets.POSTGRES_PASSWORD }}
+#            DB_HOST=${{ secrets.DB_HOST }}
+#            DB_PORT=${{ secrets.DB_PORT }}
+#            POSTGRES_USER=${{ secrets.POSTGRES_USER }}
+#            PGADMIN_DEFAULT_EMAIL=${{ secrets.PGADMIN_DEFAULT_EMAIL }}
+#            PGADMIN_DEFAULT_PASSWORD=${{ secrets.PGADMIN_DEFAULT_PASSWORD }}
+#            JWT_SECRET_KEY=${{ secrets.JWT_SECRET_KEY }}
+#
+#            IMAGE_NAME=${{ env.IMAGE_NAME }}
+#            REGISTRY=${{ env.REGISTRY }}
+#            CONTAINER_NAME=${{ env.CONTAINER_NAME }}
+#            EOF
+#            echo "GITHUB_SHA_SHORT=`echo $GITHUB_SHA | head -c8`" >> .env
+#
+#            # Make init script1 for postgres container, install the extension "uuid-ossp" for postgres
+#            echo "CREATE EXTENSION IF NOT EXISTS \"uuid-ossp\";" > init_uuid.sql
+#
+#            # <==========!==========>
+#            # Log in to DockerHub
+#            echo ${{ secrets.DOCKERHUB_TOKEN }} | docker login --username ${{ secrets.DOCKERHUB_USERNAME }} --password-stdin
+#
+#            # Pull image DockerHub
+#            docker pull $REGISTRY/$IMAGE_NAME:latest
+#
+#            # Restart docker-compose
+#            docker system prune -f
+#            docker compose down
+#            docker compose up -d
+#            # <==========!==========>

.gitignore

@@ -17,18 +17,23 @@
 # Dependency directories (remove the comment below to include it)
 # vendor/
 
+# IDE dirictories
+
+.vscode
+
 # Go workspace file
 go.work
 
 app
 
-# *.env
+*.out.tmp
+*.html
+
+*.env
 *.idea
 *.bin
 *.tmp
-
-# Environment
-# .env
+.env
 
 # Logs
 *.log

.golandcli.yml

@@ -0,0 +1,40 @@
+linters:
+  enable-all: true
+  disable:
+    - varnamelen
+    - depguard
+    - godox
+    - testpackage
+    - exhaustivestruct
+    - wsl
+    - revive
+    - ireturn
+    - exhaustruct
+    - misspell
+    - gomnd
+    - paralleltest
+    - goerr113
+    - rowserrcheck
+    - tagalign
+    - forbidigo
+    - gci
+    - gofumpt
+    - godot
+    - goimports
+    - gochecknoglobals
+    - errname
+    - funlen        #Del
+    - staticcheck   #Del
+    - sqlclosecheck #Del
+    - inamedparam   #Errors
+    - testifylint   #Errors
+    - gofmt         #Errors
+    - deadcode      #Warnings
+    - golint        #Warnings
+    - scopelint     #Warnings
+    - interfacer    #Warnings
+    - nosnakecase   #Warnings
+    - maligned      #Warnings
+    - structcheck   #Warnings
+    - ifshort       #Warnings
+    - varcheck      #Warnings

Makefile

@@ -1,12 +1,49 @@
 include .env
+export
 
-.PHONY: dc run test lint down
+.PHONY: run run-in build clean db app down doc test lint
 
-dc:
+run: ## Start the application in detached mode
 	docker-compose up -d
 
-run:
-	go build -o app ./cmd/api/main.go && ./app
+run-debug:
+	docker-compose -f local-docker-compose.yaml up
 
-down:
-	docker-compose down
+run-in: ## Start the application in interactive mode
+	docker-compose up
+
+build: ## Build Docker images
+	docker-compose build
+
+clean: ## Remove unused Docker images
+	docker system prune -af
+	docker volume prune -af
+	docker system df
+	docker rmi -f $$(docker images -q) || true
+
+db: ## Connect to the database
+	docker exec -it 2023_2_hamster-db-1 psql -U $(DB_USER) -d $(DB_NAME)
+
+app: ## Connect to the application container
+	docker exec -it 2023_2_hamster-server-1 ./app
+
+down: ## Stop and remove containers, networks, images, and volumes
+	docker-compose down
+
+doc: ## Generate API documentation using swag
+	swag init -g cmd/api/main.go
+
+test: ## Run tests
+	go test ./...;
+	find . -type d -name "logs" -exec rm -r {} \;
+
+lint: ## Run linters
+	golangci-lint run
+
+# New make
+
+# b:
+# 	go build -o app ./cmd/api/main.go
+
+# r: lint b	
+# 	./app

build/Dockerfile

@@ -0,0 +1,6 @@
+FROM golang:latest
+COPY . /app
+WORKDIR /app
+RUN go mod download
+RUN go build -o app ./cmd/api/main.go
+ENTRYPOINT ["./app"]