Add Dockerfiles and GitHub Actions workflow for building and publishing PR images (#9)

* Add Dockerfiles and GitHub Actions workflow for building and publishing PR images

* Refactor GitHub Actions workflow to build and publish PR images, updating triggers to pull requests and removing unnecessary steps for tag handling.

* Update GitHub Actions workflow to use latest Docker actions for Buildx and login

* Update Docker Build-Push Action to version 6 in GitHub Actions workflow

* Fix Dockerfile references from api-gateway to api for consistency in build process

* Remove GitHub NPM token and registry arguments from Dockerfile for security and simplicity

* Refactor GitHub Actions workflow to trigger on push events and build images for API Gateway, API, and Web, removing unnecessary GitHub NPM token arguments for improved security and simplicity.

* fix docker build and the workflow

* fix docker build and the workflow

* new code from mark-old repo

* formatting

* removing unnecessary workflows, updating docker files, and cleaning merging prisma migrations to one migration script

Author: MmagdyHafezZ

.env.template

@@ -7,7 +7,6 @@ PORT=                  # e.g. 3010
 
 # ────── Back-end API ──────
 API_PORT=              # e.g. 4222
-
 # ────── API Gateway ──────
 API_GATEWAY_PORT=      # e.g. 8000
 API_GATEWAY_HOST=      # e.g. http://localhost:8000

.gitignore

@@ -11,6 +11,7 @@ pids
 *.seed
 *.pid.lock
 
+
 # to insure no accidental commits of the seed file or mock jwt file
 seed.sql
 staging-seed.sql
@@ -59,17 +60,17 @@ typings/
 .yarn-integrity
 
 # dotenv environment variables file
-.env
+*.env
 dev.env
 dev.op.env
-.env.local
 .env.merged
 .env.op.local
 
+*.env
+.env.local
 
 # local configs
 config/local
-
 # typescript
 *.tsbuildinfo
 next-env.d.ts
@@ -103,3 +104,4 @@ dist/
 .turbo/
 out/
 .idea/whitesource/WebStormUsageMetrics.txt
+.specstory/

.prettierignore

@@ -4,6 +4,7 @@ coverage
 ./husky/_/
 **/.github/workflows/*
 helm-chart
+yarn.lock
 node_modules
 docs/
 .vscode

.secrets.baseline

@@ -1,9 +1,9 @@
 {
   "exclude": {
-    "files": "^.secrets.baseline$",
+    "files": null,
     "lines": null
   },
-  "generated_at": "2025-05-03T07:35:06Z",
+  "generated_at": "2025-07-28T14:48:09Z",
   "plugins_used": [
     {
       "name": "AWSKeyDetector"
@@ -81,7 +81,7 @@
       {
         "hashed_secret": "d08f88df745fa7950b104e4a707a31cfce7b5841",
         "is_verified": false,
-        "line_number": 22,
+        "line_number": 21,
         "type": "Secret Keyword",
         "verified_result": null
       }
@@ -95,27 +95,18 @@
         "verified_result": null
       }
     ],
-    "apps/api-gateway/Dockerfile": [
-      {
-        "hashed_secret": "f38ff65b69de46549b49035293fb9ced5f89a071",
-        "is_verified": false,
-        "line_number": 13,
-        "type": "NPM tokens",
-        "verified_result": null
-      }
-    ],
     "apps/api-gateway/src/api/api.service.ts": [
       {
         "hashed_secret": "bb27330ad8e4418fd1545f76c797f9e495ced3f1",
         "is_verified": false,
-        "line_number": 61,
+        "line_number": 62,
         "type": "Secret Keyword",
         "verified_result": null
       },
       {
         "hashed_secret": "5df614d5ca1ea5b297766ca8fc7825aae5b71cb2",
         "is_verified": false,
-        "line_number": 62,
+        "line_number": 63,
         "type": "Secret Keyword",
         "verified_result": null
       }
@@ -129,12 +120,12 @@
         "verified_result": null
       }
     ],
-    "apps/api/Dockerfile": [
+    "apps/api/src/api/attempt/services/file-content-extraction.ts": [
       {
-        "hashed_secret": "f38ff65b69de46549b49035293fb9ced5f89a071",
+        "hashed_secret": "2c0580ffd7d80319531cf629f5e90f747b1386f1",
         "is_verified": false,
-        "line_number": 14,
-        "type": "NPM tokens",
+        "line_number": 2468,
+        "type": "Secret Keyword",
         "verified_result": null
       }
     ],
@@ -165,20 +156,20 @@
         "verified_result": null
       }
     ],
-    "apps/web/Dockerfile": [
+    "apps/web/app/api/markChat/route.ts": [
       {
-        "hashed_secret": "f38ff65b69de46549b49035293fb9ced5f89a071",
+        "hashed_secret": "3f70a0183ead614880b70bff64fd39c0d9155d62",
         "is_verified": false,
-        "line_number": 14,
-        "type": "NPM tokens",
+        "line_number": 8,
+        "type": "Secret Keyword",
         "verified_result": null
       }
     ],
-    "apps/web/app/api/markChat/route.ts": [
+    "apps/web/app/api/markChat/services/reportingService.ts": [
       {
-        "hashed_secret": "3f70a0183ead614880b70bff64fd39c0d9155d62",
+        "hashed_secret": "d3ecb0d890368d7659ee54010045b835dacb8efe",
         "is_verified": false,
-        "line_number": 9,
+        "line_number": 62,
         "type": "Secret Keyword",
         "verified_result": null
       }
@@ -187,7 +178,7 @@
       {
         "hashed_secret": "60634a9040f4a588cd5ec80391507a208c79cf00",
         "is_verified": false,
-        "line_number": 7,
+        "line_number": 6,
         "type": "Secret Keyword",
         "verified_result": null
       }
@@ -205,7 +196,7 @@
       {
         "hashed_secret": "cfb93ca9f329289d5f23de2b0e065103b81a374c",
         "is_verified": false,
-        "line_number": 166,
+        "line_number": 158,
         "type": "Secret Keyword",
         "verified_result": null
       }
@@ -214,14 +205,14 @@
       {
         "hashed_secret": "f0c5bc5473fd2f959bdac630e625aa33346fd12a",
         "is_verified": false,
-        "line_number": 166,
+        "line_number": 162,
         "type": "Secret Keyword",
         "verified_result": null
       },
       {
         "hashed_secret": "ee977806d7286510da8b9a7492ba58e2484c0ecc",
         "is_verified": false,
-        "line_number": 183,
+        "line_number": 177,
         "type": "Secret Keyword",
         "verified_result": null
       }
@@ -230,21 +221,30 @@
       {
         "hashed_secret": "e1166e6dd837019ab04f130ab34c425e04161645",
         "is_verified": false,
-        "line_number": 88,
+        "line_number": 380,
         "type": "Secret Keyword",
         "verified_result": null
       },
       {
         "hashed_secret": "f0c5bc5473fd2f959bdac630e625aa33346fd12a",
         "is_verified": false,
-        "line_number": 138,
+        "line_number": 427,
         "type": "Secret Keyword",
         "verified_result": null
       },
       {
         "hashed_secret": "29080f1c58f9859ddaa6aeda7d2c410c12e222dc",
         "is_verified": false,
-        "line_number": 171,
+        "line_number": 459,
+        "type": "Secret Keyword",
+        "verified_result": null
+      }
+    ],
+    "apps/web/lib/shared.ts": [
+      {
+        "hashed_secret": "d3ecb0d890368d7659ee54010045b835dacb8efe",
+        "is_verified": false,
+        "line_number": 996,
         "type": "Secret Keyword",
         "verified_result": null
       }
@@ -262,14 +262,14 @@
       {
         "hashed_secret": "1c2b0d17c738509518ecc6efa233ee6c10e724f2",
         "is_verified": false,
-        "line_number": 166,
+        "line_number": 225,
         "type": "Basic Auth Credentials",
         "verified_result": null
       },
       {
         "hashed_secret": "f6b2b77f83ae6122acb0954c6502cf87b2c097c3",
         "is_verified": false,
-        "line_number": 206,
+        "line_number": 265,
         "type": "Secret Keyword",
         "verified_result": null
       }

.tool-versions

@@ -1,2 +1,2 @@
-nodejs 20.19.2
+nodejs 23.11.0
 yarn 1.22.22

README.md

@@ -63,33 +63,27 @@ The Mark System is built on a modular, domain-driven architecture that separates
 Mark System V2 represents a significant evolution from the original architecture, with improvements in:
 
 1. **Repository Pattern Implementation**:
-
    - Centralized data access logic
    - Improved testability and maintainability
 
 2. **Service Modularity**:
-
    - Specialized service components
    - Clear boundaries of responsibility
 
 3. **Enhanced Error Handling**:
-
    - Structured logging with stack traces
    - Error categorization and recovery strategies
 
 4. **Concurrency Management**:
-
    - Rate limiting with Bottleneck
    - Queue management for high-load operations
 
 5. **Intelligent Processing**:
-
    - Content change detection
    - Avoiding redundant operations
    - Batch processing for efficiency
 
 6. **Progress Tracking**:
-
    - Detailed job status reporting
    - Percentage-based completion indicators
 
@@ -318,7 +312,6 @@ class NATS,GHAPI externalLayer
 
 ```
 
-
 ## Acknowledgments
 
 - NestJS Team for the excellent framework

apps/api-gateway/Dockerfile

@@ -1,16 +1,14 @@
+# local-test/api-gateway.Dockerfile
 # Using a consistent base for all stages
-ARG BASE_IMAGE=icr.io/skills-network/node:20
+ARG BASE_IMAGE=node:22-alpine
 FROM ${BASE_IMAGE} AS builder
 
-ARG SN_GITHUB_NPM_TOKEN
-ARG SN_GITHUB_NPM_REGISTRY=https://npm.pkg.github.com
 ARG DIR=/usr/src/app
 
 # Pruning using turbo
 WORKDIR $DIR
 COPY . .
 RUN yarn global add turbo@^2.0.3
-RUN echo "@ibm-skills-network:registry=$SN_GITHUB_NPM_REGISTRY" >> .npmrc && echo "//npm.pkg.github.com/:_authToken=$SN_GITHUB_NPM_TOKEN" >> .npmrc
 RUN turbo prune api-gateway --docker && rm -f .npmrc
 
 # Installing the isolated workspace
@@ -37,7 +35,7 @@ FROM ${BASE_IMAGE} AS production
 ARG DIR=/usr/src/app
 ENV NODE_ENV production
 WORKDIR $DIR
-RUN apk add --no-cache dumb-init~=1
+RUN apk add --no-cache dumb-init
 COPY --chown=node:node --from=sourcer $DIR/apps/api-gateway/dist ./dist
 COPY --chown=node:node --from=sourcer $DIR/node_modules $DIR/node_modules
 ENTRYPOINT ["/usr/bin/dumb-init", "--"]
@@ -48,4 +46,4 @@ EXPOSE 3000
 FROM production AS patched
 USER root
 RUN apk -U upgrade
-USER node
+USER node

apps/api-gateway/package.json

@@ -25,6 +25,7 @@
     "test:watch": "jest --watch"
   },
   "dependencies": {
+    "@instana/collector": "^4.14.0",
     "@nestjs/common": "10.4.17",
     "@nestjs/config": "^3.0.0",
     "@nestjs/core": "10.4.17",
@@ -61,8 +62,8 @@
     "@typescript-eslint/parser": "^5.59.11",
     "dotenv-cli": "^8.0.0",
     "eslint": "^8.42.0",
-    "eslint-config-prettier": "^8.8.0",
-    "eslint-plugin-prettier": "^4.2.1",
+    "eslint-config-prettier": "^10.1.8",
+    "eslint-plugin-prettier": "^5.5.3",
     "eslint-plugin-unicorn": "^47.0.0",
     "husky": "^8.0.3",
     "jest": "^29.5.0",

apps/api-gateway/src/api/api.controller.spec.ts

@@ -27,8 +27,8 @@ describe("ApiController", () => {
         {
           provide: WINSTON_MODULE_PROVIDER,
           useValue: {
-            child: jest.fn().mockReturnValue({}), // assuming 'child' method returns an object in real implementation.
-          } as Partial<Logger>, // Partial<Logger> makes Logger optional, so that it's not necessary to implement every method of Logger.
+            child: jest.fn().mockReturnValue({}),
+          } as Partial<Logger>,
         },
       ],
     }).compile();