Merge branch 'dev' into frontend/31/create-city

.github/workflows/ci-docker.yml

@@ -26,7 +26,7 @@ jobs:
         uses: docker/build-push-action@v5
         with:
           context: ./backend
-          file: ./backend/Dockerfile
+          file: ./backend/Dockerfile.prod
           push: true
           tags: ${{ secrets.DOCKERHUB_USERNAME }}/backend:latest
 
@@ -35,6 +35,6 @@ jobs:
         uses: docker/build-push-action@v5
         with:
           context: ./frontend
-          file: ./frontend/Dockerfile
+          file: ./frontend/Dockerfile.prod
           push: true
           tags: ${{ secrets.DOCKERHUB_USERNAME }}/frontend:latest

.github/workflows/ci-tests.yml

@@ -11,3 +11,16 @@ jobs:
 
       - name: Go to frontend and run tests
         run: cd frontend && npm i && npm run test
+
+  test-back:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out code
+        uses: actions/checkout@v2
+
+      - name: Go to backend and run tests
+        run: cd backend && npm i && npm run test
+        env:
+          SECRET_KEY: ${{ secrets.SECRET_KEY }}
+
+

.github/workflows/staging-backend.yml

@@ -29,7 +29,7 @@ jobs:
           # generate some credentials from Dockerhub and store them into the repo secrets
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
-      
+
       # prepare buildx for docker
       - uses: docker/setup-buildx-action@v1
         name: Set up Docker Buildx
@@ -39,6 +39,6 @@ jobs:
         name: Build and push
         with:
           context: ./backend
-          file: ./backend/Dockerfile
+          file: ./backend/Dockerfile.prod
           push: true
           tags: ${{ secrets.DOCKERHUB_USERNAME }}/${{ secrets.DOCKERHUB_BACKEND_IMAGE_NAME }}:latest

.github/workflows/staging-frontend.yml

@@ -28,7 +28,7 @@ jobs:
           # generate some credentials from Dockerhub and store them into the repo secrets
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
-      
+
       # prepare buildx for docker
       - uses: docker/setup-buildx-action@v1
         name: Set up Docker Buildx
@@ -38,6 +38,6 @@ jobs:
         name: Build and push
         with:
           context: ./frontend
-          file: ./frontend/Dockerfile
+          file: ./frontend/Dockerfile.prod
           push: true
           tags: ${{ secrets.DOCKERHUB_USERNAME }}/${{ secrets.DOCKERHUB_FRONTEND_IMAGE_NAME }}:latest

.github/workflows/staging-imagesupload.yml

@@ -29,7 +29,7 @@ jobs:
           # generate some credentials from Dockerhub and store them into the repo secrets
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
-      
+
       # prepare buildx for docker
       - uses: docker/setup-buildx-action@v1
         name: Set up Docker Buildx
@@ -39,6 +39,6 @@ jobs:
         name: Build and push
         with:
           context: ./imagesupload
-          file: ./backend/Dockerfile
+          file: ./imagesupload/Dockerfile.prod
           push: true
           tags: ${{ secrets.DOCKERHUB_USERNAME }}/${{ secrets.DOCKERHUB_IMAGESUPLOAD_IMAGE_NAME }}:latest

backend/.env.example

@@ -1,12 +1,12 @@
 #secret key for hash
 SECRET_KEY=
 
-#mapbox secret key api
-MAPBOX_API_KEY=
-
 #google api key
 GOOGLE_API_KEY=
 
 #database
 DATABASE_USERNAME=
 DATABASE_PASSWORD=
+
+#environment 
+NODE_ENV=

backend/Dockerfile.prod

@@ -20,5 +20,5 @@ COPY --from=builder /app/dist/ /app/dist/
 
 COPY package.json package.json
 RUN npm install --omit-dev
-
+ENV NODE_ENV=production
 CMD npm run startprod

backend/jest.config.js

@@ -0,0 +1,9 @@
+/** @type {import('ts-jest').JestConfigWithTsJest} **/
+module.exports = {
+  testEnvironment: "node",
+  transform: {
+    "^.+.tsx?$": ["ts-jest",{}],
+  },
+  setupFiles: ["<rootDir>/jest.setup.ts"],
+  moduleDirectories: ['node_modules', '<rootDir>/src'],
+};

backend/jest.setup.ts

@@ -0,0 +1,4 @@
+import dotenv from "dotenv";
+import "reflect-metadata";
+
+dotenv.config();