Dev

.babelrc

@@ -0,0 +1,5 @@
+{
+    "presets": [
+        "@babel/preset-env"
+    ]
+}

.dockerignore

@@ -0,0 +1,3 @@
+node_modules
+dist
+.env

.github/workflows/build.yml

@@ -0,0 +1,84 @@
+name: Docker Image CI
+
+on:
+  push:
+    branches: [ "main" ]
+  pull_request:
+    branches: [ "main" ]
+
+jobs:
+
+  build:
+
+    runs-on: ubuntu-latest
+
+    permissions:
+      contents: read
+      packages: write
+
+
+    steps:
+    - uses: actions/checkout@v3
+
+    - name: Set image version (tag)
+      id: image_version
+      run: echo "gitsha=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT
+
+    - name: login to Registry
+      uses: docker/login-action@v3
+      with:
+        registry: ghcr.io
+        username: sarahabuirmeileh
+        password: ${{ secrets.GITHUB_TOKEN }}
+    - name: Build the Docker image
+      run: docker build . --file Dockerfile --tag ghcr.io/sarahabuirmeileh/serve-and-shine:${{ steps.image_version.outputs.gitsha }}
+    - name: Puplish docker image
+      run: docker push ghcr.io/sarahabuirmeileh/serve-and-shine:${{ steps.image_version.outputs.gitsha }}
+    - name: configer docker host
+      uses: khaledez/configure-docker-host@v1
+      with: 
+        host: 13.43.121.108
+        user: github
+        ssh-private-key: ${{ secrets.DEPLOYMENT_KEY }}
+
+    - name: deploy
+      run: docker compose -f docker-compose-prod.yml up -d
+      env: 
+        DB_PASSWORD: ${{ secrets.DB_PASSWORD}}
+        GIT_VERSISON: ${{steps.image_version.outputs.gitsha}}
+        SECRET_KEY: ${{ secrets.SECRET_KEY}}
+        DB_HOST: ${{ secrets.DB_HOST}}
+        DB_PORT:  ${{ secrets.DB_PORT}}
+        DB_USERNAME:  ${{ secrets.DB_USERNAME}}
+        DB_NAME: ${{ secrets.DB_NAME}}
+        AWS_BUCKET_NAME: ${{ secrets.AWS_BUCKET_NAME}}
+        AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID}}
+        AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY}}
+        AWS_REGION: ${{ secrets.AWS_REGION}}
+        AWS_CERTIFICATES_BUCKET_NAME: ${{ secrets.AWS_CERTIFICATES_BUCKET_NAME}}
+        PORT:  ${{ secrets.PORT}}
+
+    - name: print logs
+      if: always()
+      run: docker compose logs
+
+    - name: Run Migrations
+      run: |
+        docker compose -f docker-compose-prod.yml exec app npx typeorm-ts-node-esm migration:run -d ./src/db/dataSource.ts &&
+        docker compose -f docker-compose-prod.yml exec app mv ./src/db/migrations/1697005494066-CreateRoles.ts ./src/db/migration &&
+        docker compose -f docker-compose-prod.yml exec app npx typeorm-ts-node-esm migration:run -d ./src/db/dataSource.ts &&
+        docker compose -f docker-compose-prod.yml exec app mv ./src/db/migrations/1697005554406-RootUser.ts  ./src/db/migration &&
+        docker compose -f docker-compose-prod.yml exec app npx typeorm-ts-node-esm migration:run -d ./src/db/dataSource.ts
+      env: 
+        DB_PASSWORD: ${{ secrets.DB_PASSWORD}}
+        DB_HOST: ${{ secrets.DB_HOST}}
+        DB_PORT:  ${{ secrets.DB_PORT}}
+        DB_USERNAME:  ${{ secrets.DB_USERNAME}}
+        DB_NAME: ${{ secrets.DB_NAME}}
+        GIT_VERSISON: ${{steps.image_version.outputs.gitsha}}
+        PORT:  ${{ secrets.PORT}}
+        AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID}}
+        AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY}}
+
+
+

.gitignore

@@ -1,3 +1,5 @@
 node_modules
 dist
-.env
+.env
+.env.test
+logger

.vscode/settings.json

@@ -0,0 +1,5 @@
+{
+    "cSpell.words": [
+        "Deregistration"
+    ]
+}

Dockerfile

@@ -0,0 +1,16 @@
+FROM node:20-alpine
+
+WORKDIR /user/app
+COPY package.json package-lock.json ./
+
+RUN npm ci
+
+RUN apk add curl
+
+ADD . .
+RUN npm run build
+
+HEALTHCHECK --interval=10s --timeout=3s \
+    CMD curl -f http://localhost/ || exit 1
+
+CMD node --loader ts-node/esm ./dist/app.js

__test__/createOrgAdmin.test.js

@@ -0,0 +1,28 @@
+import dataSource, { initDB } from '../dist/src/db/dataSource.js'
+import { creatOrganizationAdmin } from '../dist/src/controllers/organizationAdmin.js';
+
+beforeAll(async () => {
+    await initDB();
+});
+
+afterAll(async () => {
+    await dataSource.destroy();
+});
+
+const tmpData = {
+    "name": "Sarah Abu Irmaileh",
+    "email": "tamimitarteel27@gamil.com",
+    "password": "123456",
+    "organizationId": "e4b41a72-2abe-459c-8657-7a09956f1243"
+};
+
+describe("create an organization admin", () => {
+    let data;
+    beforeAll(async () => {
+        data = await creatOrganizationAdmin({name: tmpData.name, email: tmpData.email, password: tmpData.password, organizationId: tmpData.organizationId});
+    })
+
+    it("returns a success response", async () => {
+        expect(data.name).toBe('Sarah Abu Irmaileh');
+    })
+})

app.ts

@@ -2,47 +2,48 @@ import "./config.js"
 import express from 'express'
 import dotenv from 'dotenv'
 import createError from 'http-errors'
-import dataSource from './src/db/dataSource.js'
+import { initDB } from './src/db/dataSource.js'
 import logger from 'morgan'
+import cookieParser from 'cookie-parser'
+import fileUpload from 'express-fileupload';
 
 import indexRouter from "./src/routes/index.js"
+import permissionRouter from "./src/routes/permission.js"
+import roleRouter from "./src/routes/role.js"
+import voluntaryWorkRouter from "./src/routes/voluntaryWork.js"
+import organizationAdminRouter from "./src/routes/organizationAdmin.js"
+import organizationProfileRouter from "./src/routes/organizationProfile.js"
+import volunteerRouter from "./src/routes/volunteer.js"
+import { authenticate } from "./src/middleware/auth/authenticate.js"
+import { errorHandler } from "./src/middleware/errorHandler/errorHandler.js"
 
 const app = express();
 dotenv.config();
 const PORT = process.env.PORT || 3000;
 
 app.use(express.json());
 app.use(express.urlencoded({ extended: false }));
+app.use(cookieParser());
+app.use(fileUpload({ limits: { fileSize: 50 * 1024 * 1024 } }))
 
 app.use('/', indexRouter);
-// app.use('/users', usersRouter);
+app.use('/permission', authenticate, permissionRouter);
+app.use('/role', authenticate, roleRouter);
+app.use('/voluntaryWork', authenticate, voluntaryWorkRouter);
+app.use('/organizationAdmin', /*authenticate,*/ organizationAdminRouter);
+app.use('/organizationProfile', /*authenticate,*/ organizationProfileRouter);
+app.use("/volunteer", volunteerRouter);
 
 // catch 404 and forward to error handler
 app.use(function (req, res, next) {
   next(createError(404));
 });
-
-
-// error handler
-app.use(function (err: any, req: any, res: any, next: any) {
-  // set locals, only providing error in development
-  res.locals.message = err.message;
-  res.locals.error = req.app.get('env') === 'development' ? err : {};
-
-  // render the error page
-  res.status(err.status || 500).send({ error: err.message });
-});
-
-dataSource.initialize().then(() => {
-  console.log("Connected to DB!");
-}).catch(err => {
-  console.error('Failed to connect to DB: ' + err);
-});
+app.use(errorHandler);
 
 app.listen(PORT, () => {
   logger(`App is listening on port ${PORT}`);
   console.log(`App is listening on port ${PORT} and host http://localhost:${PORT}`);
+  initDB();
 });
 
-
 export default app;

docker-compose-prod.yml

@@ -0,0 +1,36 @@
+version: '3'
+
+services:
+  mysql:
+    image: mysql
+    environment:
+      - MYSQL_ROOT_PASSWORD=$DB_PASSWORD
+      - MYSQL_DATABASE=$DB_NAME
+    volumes:
+      - db-data:/var/lib/mysql
+    ports:
+      - "3306:3306"
+    healthcheck:
+      test: [ "CMD", "mysqladmin", "ping", "-h", "localhost" ]
+      timeout: 20s
+      retries: 10
+    restart: always
+
+  app:
+    image: ghcr.io/sarahabuirmeileh/serve-and-shine:$GIT_VERSISON
+    mem_limit: 5g
+    restart: always #like sysd service
+    environment:
+      - PORT=80
+      - DB_HOST=mysql  # to comunicate the servies in the same project ny the name of the serevice
+      - DB_USERNAME=$DB_USERNAME
+      - DB_PASSWORD=$DB_PASSWORD
+      - DB_NAME=$DB_NAME
+    ports:
+      - "80:80"
+    depends_on:
+      mysql:
+        condition: service_healthy
+
+volumes:
+  db-data:

docker-compose.yml

@@ -0,0 +1,35 @@
+version: "3"
+
+services:
+  mysql:
+    container_name: db
+    image: mysql
+    environment:
+      - MYSQL_ROOT_PASSWORD=$DB_PASSWORD
+      - MYSQL_DATABASE=$DB_NAME
+    volumes:
+      - db-data:/var/lib/mysql
+    ports:
+      - "3306:3306"
+    healthcheck:
+      test: [ "CMD", "mysqladmin", "ping", "-h", "localhost" ]
+      timeout: 20s
+      retries: 10
+
+  app:
+    container_name: app-docker
+    build: .
+    environment:
+      - PORT=$PORT
+      - DB_HOST=db
+      - DB_USERNAME=$DB_USERNAME
+      - DB_PASSWORD=$DB_PASSWORD
+      - DB_NAME=$DB_NAME
+      - DB_PORT=$DB_PORT
+    ports:
+      - "3000:80"
+    depends_on:
+      mysql:
+        condition: service_healthy
+volumes:
+  db-data:

infrastructure/setup-instance.sh

@@ -0,0 +1,35 @@
+#!/bin/sh
+set -e
+
+sudo apt update
+sudo apt upgrade -y
+
+sudo apt-get install -y ca-certificates curl gnupg
+sudo install -m 0755 -d /etc/apt/keyrings
+
+# install docker
+for pkg in docker.io docker-doc docker-compose podman-docker containerd runc; do sudo apt-get remove $pkg; done
+
+curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo gpg --dearmor -o /etc/apt/keyrings/docker.gpg
+sudo chmod a+r /etc/apt/keyrings/docker.gpg
+# Add the repository to Apt sources:
+echo \
+  "deb [arch="$(dpkg --print-architecture)" signed-by=/etc/apt/keyrings/docker.gpg] https://download.docker.com/linux/ubuntu \
+  "$(. /etc/os-release && echo "$VERSION_CODENAME")" stable" | \
+  sudo tee /etc/apt/sources.list.d/docker.list > /dev/null
+sudo apt update
+
+sudo apt-get install -y docker-ce docker-ce-cli containerd.io docker-buildx-plugin docker-compose-plugin
+
+# create github user
+sudo mkdir -p /home/app
+sudo useradd --no-create-home --home-dir /home/app --shell /bin/bash github
+sudo usermod --append --groups docker github
+sudo usermod --append --groups docker ubuntu
+sudo chown github:github -R /home/app
+
+github_pubkey='ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIH/nuLtOesRq8NPmQT/Lurvz/qPsgpwyIPzyAyZIaD43 sarah@Sarah-Lenovo'
+
+sudo -u github sh -c "mkdir -p /home/app/.ssh && echo $github_pubkey > /home/app/.ssh/authorized_keys"
+
+sudo reboot

jest.config.json

@@ -0,0 +1,3 @@
+{
+    "testTimeout": 20000
+}

logger.ts

@@ -0,0 +1,12 @@
+import winston from "winston";
+
+const baseLogger = winston.createLogger({
+  format: winston.format.json(),
+  defaultMeta: { project: 'serve and shine', time: new Date() },
+  transports: [
+    new winston.transports.File({ filename: 'logger/error.log', level: 'error' }),
+    //new winston.transports.File({ filename: 'logger/all.log' }),
+  ],
+});
+
+export default baseLogger;