update: rebase

.env.production.example

@@ -22,5 +22,5 @@ SHLP_POSTGRES_DB=
 SHLP_POSTGRES_USERNAME=
 SHLP_POSTGRES_PASSWORD=
 POSTGRES_PRISMA_URL=postgresql://${SHLP_POSTGRES_USERNAME}:${SHLP_POSTGRES_PASSWORD}@${SHLP_POSTGRES_HOST}:5432/${SHLP_POSTGRES_DB}
-PRISMA_FIELD_ENCRYPTION_KEY=
-PRISMA_FIELD_ENCRYPTION_HASH_SALT=
+PRISMA_FIELD_ENCRYPTION_KEY=k1.aesgcm256.Wmy6koJaJpjB0H25qBccLfQ84AvpmCjexanqCHJ5Hr0=
+PRISMA_FIELD_ENCRYPTION_HASH_SALT=1a4671c31ff22834a56d4f3741aeac8cc8662a11c73802083ea5a118e5ee600e

.github/workflows/docker-publish.yml → .github/workflows/tests-build-push.yml

@@ -1,16 +1,33 @@
-name: Build and Push Smart Health Links Portal Image
+name: Test - Build - Push
 
 on:
-  workflow_run:
-    workflows: ['Tests with Coverage Check']
-    types: [completed]
+  push:
     branches:
       - 'main'
+  pull_request:
+    branches:
+      - main
 
 jobs:
+  test:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Setup Node
+        uses: actions/setup-node@v3
+        with:
+          node-version: '20'
+          cache: 'yarn'
+
+      - name: Install Dependencies
+        run: yarn install --frozen-lockfile
+
+      - name: Run Jest Tests
+        run: yarn test --collectCoverage=false
+
   build-and-push:
     runs-on: ubuntu-latest
-    if: ${{ github.event.workflow_run.conclusion == 'success' }}
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -21,21 +38,21 @@ jobs:
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
 
-      - name: Login to DockerHub
-        uses: docker/login-action@v3
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-
-      - name: Build and push tag
+      - name: Test Docker build
         if: ${{ github.ref_name != 'main' }}
         uses: docker/build-push-action@v5
         with:
-          platforms: linux/amd64,linux/arm64
-          push: true
+          platforms: linux/amd64
+          push: false # dont push image - Used to confirm build success on branches
           file: docker/production/Dockerfile
-          tags: jembi/smart-health-links-portal:${{ github.ref_name }}
 
+      - name: Login to DockerHub
+        if: ${{ github.ref_name == 'main' }}
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
       - name: Build and push latest
         if: ${{ github.ref_name == 'main' }}
         uses: docker/build-push-action@v5

.gitignore

@@ -38,3 +38,6 @@ next-env.d.ts
 # db
 dev.db
 dev.db-journal
+
+#logs
+/logs

docker-compose.yml

@@ -67,4 +67,4 @@ volumes:
 
 networks:
   smart-health-links-portal-network:
-    driver: bridge
+    driver: bridge

docker/production/Dockerfile

@@ -3,7 +3,7 @@ FROM node:20-alpine AS base
 # 1. Install dependencies only when needed
 FROM base AS deps
 # Check https://github.com/nodejs/docker-node/tree/b4117f9333da4138b03a546ec926ef50a31506c3#nodealpine to understand why libc6-compat might be needed.
-RUN apk add --no-cache libc6-compat
+RUN apk add --update --no-cache libc6-compat python3 make g++ && rm -rf /var/cache/apk/*
 
 WORKDIR /app
 
@@ -20,7 +20,9 @@ COPY --from=deps /app/node_modules ./node_modules
 COPY . .
 # This will do the trick, use the corresponding env file for each environment.
 COPY .env.production.example .env.production
-RUN npm run build
+
+RUN yarn build && \
+    yarn next-swagger-doc-cli next-swagger-doc.json
 
 # 3. Production image, copy all the files and run next
 FROM base AS runner
@@ -37,13 +39,18 @@ COPY --from=builder /app/public ./public
 # https://nextjs.org/docs/advanced-features/output-file-tracing
 COPY --from=builder --chown=nextjs:nodejs /app/.next/standalone ./
 COPY --from=builder --chown=nextjs:nodejs /app/.next/static ./.next/static
+COPY --from=builder /app/prisma ./prisma
 
+# Ensure logs directory is created under the correct permissions
+RUN mkdir logs && \
+    chmod 755 logs && \
+    chown nextjs:nodejs logs
 
 USER nextjs
 
 EXPOSE 3000
 
-ENV PORT 3000
-ENV HOSTNAME "0.0.0.0"
+ENV PORT=3000
+ENV HOSTNAME="0.0.0.0"
 
-CMD ["node", "server.js"]
+CMD ["sh", "-c", "npx --yes prisma migrate deploy --schema=./prisma/schema.prisma && node server.js"]

logger.config.json

@@ -0,0 +1,15 @@
+{
+    "transporters": [
+        {
+            "transporterType": "file",
+            "options": {
+                "filename": "logs/logs-%DATE%.log",
+                "datePattern": "YYYY-MM-DD",
+                "zippedArchive": true,
+                "maxSize": "20m",
+                "maxFiles": "14d"
+            }
+        }
+    ],
+    "format": ["timestamp", "json"]
+}

package.json

@@ -32,6 +32,7 @@
     "qrcode": "^1.5.4",
     "react": "^18",
     "react-dom": "^18",
+    "winston-daily-rotate-file": "^5.0.0",
     "swagger-ui-react": "^5.17.14",
     "uuid": "^10.0.0",
     "zod": "^3.23.8"
@@ -45,6 +46,7 @@
     "@types/node": "^22.0.3",
     "@types/react": "^18",
     "@types/react-dom": "^18",
+    "@types/winston": "^2.4.4",
     "@types/uuid": "^10.0.0",
     "@typescript-eslint/eslint-plugin": "^8.4.0",
     "eslint": "^8.57.0",

src/app/api/auth/authOptions.ts

@@ -21,7 +21,22 @@ export const authOptions: AuthOptions = {
   ],
   callbacks: {
     session: async ({ session, token }) => {
-      return { ...session, user: token.user };
+      return { ...session, ...token };
+    },
+    jwt: (params) => {
+      const tokenParam = params['token'];
+      if (tokenParam?.['token']) {
+        const { user = {}, token = {}, account = {} } = tokenParam;
+
+        return {
+          user,
+          token,
+          account: {
+            access_token: account['access_token'],
+          },
+        };
+      }
+      return params;
     },
   },
 };

src/app/api/route.ts

@@ -1,5 +1,10 @@
-import { NextResponse, NextRequest } from 'next/server';
+import { NextResponse, NextRequest } from "next/server";
+
+import { LogHandler } from "@/lib/logger";
+
+const logger = new LogHandler(__dirname)
 
 export async function GET(request) {
-  return NextResponse.json({ message: 'API Health Check' }, { status: 200 });
+    logger.info("API connected successfully");
+    return NextResponse.json({ message: "API Health Check" }, { status: 200 });
 }

src/app/api/v1/server-configs/route.test.ts

@@ -5,6 +5,7 @@
 import { NextRequest, NextResponse } from 'next/server';
 
 import { POST, GET } from '@/app/api/v1/server-configs/route';
+import { validateUserRoles } from '@/app/utils/authentication';
 import { handleApiValidationError } from '@/app/utils/error-handler';
 import {
   CreateServerConfigDto,
@@ -14,6 +15,10 @@ import { mapDtoToModel, mapModelToDto } from '@/mappers/server-config-mapper';
 import { addServerConfigUseCase } from '@/usecases/server-configs/add-server-config';
 import { getServerConfigsUseCase } from '@/usecases/server-configs/get-server-configs';
 
+jest.mock('@/app/utils/authentication', () => ({
+  validateUserRoles: jest.fn(),
+}));
+
 jest.mock('@/usecases/server-configs/add-server-config', () => ({
   addServerConfigUseCase: jest.fn(),
 }));
@@ -53,6 +58,8 @@ describe('POST /api/v1/server-configs', () => {
     endpointUrl: 'https://dto-endpoint-url.com',
   };
 
+  const mockRoute = '/api/v1/server-configs';
+
   const mockRequest = (body: any) =>
     new NextRequest('http://localhost/api/v1/server-configs', {
       method: 'POST',
@@ -65,6 +72,7 @@ describe('POST /api/v1/server-configs', () => {
 
   it('should return server config DTO and status 201 when server config is successfully created', async () => {
     (mapDtoToModel as jest.Mock).mockReturnValue(mockServerConfigModel);
+    (validateUserRoles as jest.Mock).mockResolvedValue(true);
     (addServerConfigUseCase as jest.Mock).mockResolvedValue(
       mockServerConfigModel,
     );
@@ -83,6 +91,7 @@ describe('POST /api/v1/server-configs', () => {
   it('should handle validation errors and return status 422', async () => {
     const error = new Error('Validation error');
     (addServerConfigUseCase as jest.Mock).mockRejectedValue(error);
+    (validateUserRoles as jest.Mock).mockResolvedValue(true);
     (handleApiValidationError as jest.Mock).mockReturnValue(
       NextResponse.json({ message: 'Validation error' }, { status: 422 }),
     );
@@ -148,6 +157,7 @@ describe('GET /api/v1/server-configs', () => {
     (getServerConfigsUseCase as jest.Mock).mockResolvedValue([
       mockServerConfigModel,
     ]);
+    (validateUserRoles as jest.Mock).mockResolvedValue(true);
     (mapModelToDto as jest.Mock).mockReturnValue(mockServerConfigDto);
 
     const request = mockRequest();