This PR covers the completion of Sprint 1 and the implementation of Sprint 2 - Task 1,2 for the Live Bootcamp Project.

.env

@@ -0,0 +1,4 @@
+JWT_SECRET=fUkwAovmPVsfEFx8Eu9rGRIawGPhdOSw2hsWohXW1Osxcy4in7Lad97CR08bA775XJ2Li+DD5xL09KaaA8cNuQ==
+DATABASE_URL=postgres://postgres:123zxcQWE@localhost:5432
+POSTGRES_PASSWORD=123zxcQWE
+SQLX_OFFLINE=true

.github/workflows/prod.yml

@@ -6,93 +6,119 @@ on:
     branches:
       - main
   workflow_dispatch:
+env:
+  SQLX_OFFLINE: true
 
 jobs:
   build:
     runs-on: ubuntu-latest
-
+    environment: DOCKER-Sprint1
+
+    services:
+      postgres:
+        # Docker Hub image
+        image: postgres:15.2-alpine
+        # Environment variables scoped only for the `postgres` element
+        env:
+          POSTGRES_USER: postgres
+          POSTGRES_PASSWORD: ${{ secrets.POSTGRES_PASSWORD }}
+          POSTGRES_DB: postgres
+        # Opens tcp port 5432 on the host and service container
+        ports:
+          - 5432:5432
+      redis:
+        image: redis:7.0-alpine
+        ports:
+          - 6379:6379
     steps:
       # Checkout code from the repository
-    - name: Checkout code
-      uses: actions/checkout@v2
-
-      # Cache dependencies to speed up build times
-    - name: Cache dependencies
-      uses: actions/cache@v3
-      with:
-        path: |
-          app-service/.cargo
-          app-service/target/
-          auth-service/.cargo
-          auth-service/target/
-        key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
-        restore-keys: ${{ runner.os }}-cargo-
-
-    - name: Install Rust
-      run: rustup update stable && rustup default stable
-
-    - name: Build and test app-service code
-      working-directory: ./app-service
-      run: |
-        cargo build --verbose
-        cargo test --verbose
-
-    - name: Build and test auth-service code
-      working-directory: ./auth-service
-      run: |
-        cargo build --verbose
-        cargo test --verbose
-
-      # Set up Docker Buildx for multi-platform builds
-    - name: Set up Docker Buildx
-      uses: docker/setup-buildx-action@v2
-
-    - name: Log in to Docker Hub
-      uses: docker/login-action@v2
-      with:
-        username: ${{ secrets.DOCKER_USERNAME }}
-        password: ${{ secrets.DOCKER_PASSWORD }}
-
-    - name: Build and push Docker images
-      uses: docker/bake-action@v2.3.0
-      with:
-        push: true
-        files: |
-          compose.yml
-          compose.override.yml
-        set: |
-          *.cache-from=type=gha
-          *.cache-to=type=gha,mode=max
+      - name: Checkout code
+        uses: actions/checkout@v2
+
+        # Cache dependencies to speed up build times
+      - name: Cache dependencies
+        uses: actions/cache@v3
+        with:
+          path: |
+            app-service/.cargo
+            app-service/target/
+            auth-service/.cargo
+            auth-service/target/
+          key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
+          restore-keys: ${{ runner.os }}-cargo-
+
+      - name: Install Rust
+        run: rustup update stable && rustup default stable
+
+      - name: Build and test app-service code
+        working-directory: ./app-service
+        run: |
+          cargo build --verbose
+          cargo test --verbose
+
+      - name: Build and test auth-service code
+        working-directory: ./auth-service
+        env:
+          JWT_SECRET: ${{ secrets.JWT_SECRET }}
+        run: |
+          export JWT_SECRET=secret
+          export POSTGRES_PASSWORD=${{ secrets.POSTGRES_PASSWORD }}
+          cargo build --verbose
+          cargo test --verbose
+
+        # Set up Docker Buildx for multi-platform builds
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+
+      - name: Log in to Docker Hub
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+
+      - name: Build and push Docker images
+        uses: docker/bake-action@v2.3.0
+        with:
+          push: true
+          files: |
+            compose.yml
+            compose.override.yml
+          set: |
+            *.cache-from=type=gha
+            *.cache-to=type=gha,mode=max
 
   deploy:
     needs: build
     runs-on: ubuntu-latest
+    environment: DOCKER-Sprint1
 
     steps:
-    - name: Checkout code
-      uses: actions/checkout@v2
-
-    - name: Log in to Docker Hub
-      uses: docker/login-action@v1
-      with:
-        username: ${{ secrets.DOCKER_USERNAME }}
-        password: ${{ secrets.DOCKER_PASSWORD }}
-
-    - name: Install sshpass
-      run: sudo apt-get install sshpass
-
-    - name: Copy compose.yml to droplet
-      run: sshpass -v -p '${{ secrets.DROPLET_PASSWORD }}' scp -o StrictHostKeyChecking=no compose.yml root@${{ vars.DROPLET_IP }}:~
-
-    - name: Deploy
-      uses: appleboy/ssh-action@master
-      with:
-        host: ${{ vars.DROPLET_IP }}
-        username: root
-        password: ${{ secrets.DROPLET_PASSWORD }}
-        script: |
-          cd ~
-          export AUTH_SERVICE_IP=${{ vars.DROPLET_IP }}
-          docker compose down
-          docker compose pull
-          docker compose up -d
+      - name: Checkout code
+        uses: actions/checkout@v2
+
+      - name: Log in to Docker Hub
+        uses: docker/login-action@v1
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+
+      - name: Install sshpass
+        run: sudo apt-get install sshpass
+
+      - name: Copy compose.yml to droplet
+        run: sshpass -v -p '${{ secrets.DROPLET_PASSWORD }}' scp -o StrictHostKeyChecking=no compose.yml root@${{ vars.DROPLET_IP }}:~
+
+      - name: Deploy
+        uses: appleboy/ssh-action@master
+        with:
+          host: ${{ vars.DROPLET_IP }}
+          username: root
+          password: ${{ secrets.DROPLET_PASSWORD }}
+          script: |
+            cd ~
+            export JWT_SECRET=${{ secrets.JWT_SECRET }}
+            export AUTH_SERVICE_IP=${{ vars.DROPLET_IP }}
+            export POSTGRES_PASSWORD=${{ secrets.POSTGRES_PASSWORD }}
+            docker compose down
+            docker compose pull
+            docker compose up -d

.gitignore

@@ -0,0 +1,2 @@
+/test_macros/target
+.env

README.md

@@ -28,8 +28,67 @@ visit http://localhost:3000
 
 ## Run servers locally (Docker)
 ```bash
-docker compose build
-docker compose up
+./docker.sh
 ```
+```CMD for Windows
+.\docker.bat
+```
+
+visit http://localhost:8000 and http://localhost:3000
+
+
+
+## Database Migrations
+```bash
+#more info about sqlx-cli
+https://github.com/launchbadge/sqlx/blob/main/sqlx-cli/README.md#install
+
+1. cargo install sqlx-cli --no-default-features --features native-tls,postgres
+
+
+#NOTE: Make sure to execute this command in the auth-service directory!
+# creates 2 new migration scripts named:
+# "migrations/[TIMESTAMP]_create_users_table_down.sql" and "migrations/[TIMESTAMP]_create_users_table_up.sql"
+2. sqlx migrate add -r create_users_table
+
+#NOTE: Make sure to execute this command in the auth-service directory!
+#Generates build.rs script, which is used to generate the database schema
+3. sqlx migrate build-script
+
+4.
+a #SQLX_OFFLINE environment variable to avoid connecting to the database at runtime
+#Add this line to Dockerfile 
+# # Build application
+# COPY . .
+ENV SQLX_OFFLINE=true
+#RUN cargo build --release --bin auth-service
 
-visit http://localhost:8000 and http://localhost:3000
+b # Adn to .env file
+SQLX_OFFLINE=true
+
+c#And execute this
+cargo sqlx prepare
+
+d #Restart rust-analyzer sever
+```
+
+## Docker Postgres
+```bash
+# Pull the latest Postgres image from Docker Hub
+1. docker pull postgres:15.2-alpine
+
+# Run the Postgres container
+2. docker run --name ps-db -e POSTGRES_PASSWORD=[YOUR_POSTGRES_PASSWORD] -p 5432:5432 -d postgres:15.2-alpine
+```
+
+
+## Drop Test Databases with Uiid as name
+```sql
+SELECT format(
+    'DROP DATABASE "%s";',
+    datname
+)
+FROM pg_database
+WHERE datname ~
+'^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$';
+```

app-service/Dockerfile

@@ -1,5 +1,5 @@
 # Start with image that has the Rust toolchain installed
-FROM rust:1.90-alpine AS chef
+FROM rust:1.91-alpine AS chef
 USER root
 # Add cargo-chef to cache dependencies
 RUN apk add --no-cache musl-dev & cargo install cargo-chef

auth-service/.gitignore

@@ -1,2 +1,3 @@
 /target
-.env
+/test_macros/target
+.env