resolve conflit

.drone.yml

@@ -0,0 +1,63 @@
+kind: pipeline
+type: docker
+name: LeftOvers_Api
+
+trigger:
+  event:
+    - push
+
+steps:
+  - name: api-build
+    image: node:latest
+    commands:
+      - cd ./API-Project
+      - npm install
+      - npm run build
+
+  - name: test
+    image: node:latest
+    commands:
+      - cd ./API-Project
+      - npm run test
+    depends_on: [ api-build ]
+
+  - name: docker-build-and-push
+    image: plugins/docker
+    settings:
+      dockerfile: API-Project/Dockerfile
+      context: API-Project
+      registry: hub.codefirst.iut.uca.fr
+      repo: hub.codefirst.iut.uca.fr/rayhan.hassou/leftovers_api
+      username:
+        from_secret: SECRET_REGISTRY_USERNAME
+      password:
+        from_secret: SECRET_REGISTRY_PASSWORD
+      depends_on: [ api-build ]
+
+  #container deployment
+  - name: deploy-container
+    image: hub.codefirst.iut.uca.fr/thomas.bellembois/codefirst-dockerproxy-clientdrone:latest
+    environment:
+        IMAGENAME: hub.codefirst.iut.uca.fr/rathan.hassou/leftovers_api:latest
+        CONTAINERNAME: left-over-container
+        COMMAND: create
+        OVERWRITE: true
+        ADMINS: louison.parant,remi.regnault,rayhan.hassou
+    depends_on: [ docker-build-and-push ]
+
+  - name: code-analysis
+    image: node:latest
+    environment:
+      SONAR_TOKEN:
+        from_secret: SONAR_TOKEN
+    settings:
+      sources: ./API-Project
+    commands:
+      - export SONAR_SCANNER_VERSION=4.7.0.2747
+      - export SONAR_SCANNER_HOME=$HOME/.sonar/sonar-scanner-$SONAR_SCANNER_VERSION-linux
+      - curl --create-dirs -sSLo $HOME/.sonar/sonar-scanner.zip https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-$SONAR_SCANNER_VERSION-linux.zip
+      - unzip -o $HOME/.sonar/sonar-scanner.zip -d $HOME/.sonar/
+      - export PATH=$SONAR_SCANNER_HOME/bin:$PATH
+      - export SONAR_SCANNER_OPTS="-server"
+      - sonar-scanner -D sonar.projectKey=LeftOvers_Api -D sonar.sources=. -D sonar.host.url=https://codefirst.iut.uca.fr/sonar
+    depends_on: [ api-build ]

.gitignore

@@ -94,6 +94,7 @@ out
 # Nuxt.js build / generate output
 .nuxt
 dist
+/build/
 
 # Gatsby files
 .cache/

API-Project/Dockerfile

@@ -0,0 +1,21 @@
+FROM node:14 AS builder
+
+WORKDIR /usr/src/app
+
+COPY package*.json ./
+RUN npm install
+
+COPY . .
+
+RUN npm run build
+
+FROM node:14
+
+WORKDIR /usr/src/app
+
+COPY --from=builder /usr/src/app/node_modules ./node_modules
+COPY --from=builder /usr/src/app/dist ./dist
+
+EXPOSE 3000 
+
+CMD [ "node", "dist/index.js" ]

API-Project/package.json

@@ -4,9 +4,10 @@
   "description": "",
   "main": "src/server.ts",
   "scripts": {
-    "start": "node build/server.js",
+    "start": "node dist/server.js",
     "build": "tsup src/server.ts --format cjs --clean",
-    "dev": "nodemon --watch src -e js,ts,json --exec \"ts-node src/server.ts\""
+    "dev": "nodemon --watch src -e js,ts,json --exec \"ts-node src/server.ts\"",
+    "test": "jest"
     },
   "author": "",
   "license": "ISC",
@@ -22,6 +23,11 @@
     "typescript": "^5.2.2"
   },
   "devDependencies": {
-    "@types/pg": "^8.10.9"
+
+    "@types/pg": "^8.10.9",
+    "@types/jest": "^29.5.8",
+    "jest": "^29.7.0",
+    "ts-jest": "^29.1.1"
+
   }
 }