Merge pull request #26 from Selecro/favourites

Favourites
Selecro · Sep 11, 2023 · fd28611 · fd28611
2 parents 65d6143 + 0b27ffe
commit fd28611
Show file tree

Hide file tree

Showing 20 changed files with 991 additions and 285 deletions.
diff --git a/.github/workflows/continuous-deployment.yml b/.github/workflows/continuous-deployment.yml
@@ -73,8 +73,8 @@ jobs:
           key: ${{ secrets.SSH_PRIVATE_KEY }}
           port: ${{ secrets.SSH_PORT }}
           script: |
-            docker login && \
-            docker pull selecro/${{ env.IMAGE }} && \
+            docker login || true && \
+            docker pull selecro/${{ env.IMAGE }}:${{ env.SHORT_SHA }} && \
             docker ps -a | grep ${{ env.IMAGE }} && docker stop ${{ env.IMAGE }} || true && \
             docker ps -a | grep ${{ env.IMAGE }} && docker rm ${{ env.IMAGE }} || true && \
             docker run \
@@ -95,8 +95,10 @@ jobs:
             -e VAULT_URL="${{ secrets.VAULT_URL }}" \
             -e CLIENT_ID="${{ secrets.CLIENT_ID }}" \
             -e ROOT_VAULT="${{ secrets.ROOT_VAULT }}" \
+            -e INSTRUCTION_KEY="${{ secrets.INSTRUCTION_KEY }}" \
+            -e INSTRUCTION_KEY_PERMISSIONS="${{ secrets.INSTRUCTION_KEY_PERMISSIONS }}" \
             --name ${{ env.IMAGE }} -dp ${{ env.PORT }}:${{ env.PORT }} \
-            selecro/${{ env.IMAGE }} && \
+            selecro/${{ env.IMAGE }}:${{ env.SHORT_SHA }} && \
             docker update --restart unless-stopped ${{ env.IMAGE }} && exit
 
       - name: Cleanup

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -50,11 +50,11 @@
   ],
   "dependencies": {
     "@loopback/authentication-jwt": "^0.14.1",
-    "@loopback/boot": "^6.0.0",
-    "@loopback/core": "^5.1.0",
-    "@loopback/repository": "^6.0.0",
-    "@loopback/rest": "^13.1.0",
-    "@loopback/rest-explorer": "^6.0.0",
+    "@loopback/boot": "^6.1.1",
+    "@loopback/core": "^5.1.1",
+    "@loopback/repository": "^6.1.1",
+    "@loopback/rest": "^13.1.1",
+    "@loopback/rest-explorer": "^6.1.1",
     "@nestjs/common": "^10.2.1",
     "@nestjs/core": "^10.2.1",
     "@nestjs/platform-express": "^10.2.1",
@@ -66,18 +66,18 @@
     "multer": "^1.4.5-lts.1",
     "nodemailer": "^6.9.3",
     "path": "^0.12.7",
-    "tslib": "^2.6.0"
+    "tslib": "^2.0.0"
   },
   "devDependencies": {
-    "@loopback/build": "^10.1.0",
-    "@loopback/eslint-config": "^14.0.0",
-    "@loopback/testlab": "^6.0.0",
+    "@loopback/build": "^10.1.1",
+    "@loopback/eslint-config": "^14.0.2",
+    "@loopback/testlab": "^6.1.1",
     "@types/jsonwebtoken": "^9.0.2",
     "@types/multer": "^1.4.7",
-    "@types/node": "^14.18.47",
+    "@types/node": "^16.18.38",
     "@types/nodemailer": "^6.4.8",
-    "eslint": "^8.40.0",
+    "eslint": "^8.45.0",
     "source-map-support": "^0.5.21",
-    "typescript": "~4.9.5"
+    "typescript": "~5.1.6"
   }
 }
diff --git a/src/application.ts b/src/application.ts
@@ -14,10 +14,8 @@ import path from 'path';
 import {PingController, UserController} from './controllers';
 import {DbDataSource} from './datasources';
 import {
-  GroupRepository,
   InstructionRepository,
   StepRepository,
-  UserGroupRepository,
   UserLinkRepository,
   UserRepository,
 } from './repositories';
@@ -55,9 +53,7 @@ export class SelecroBackendApplication extends BootMixin(
     this.repository(UserRepository);
     this.repository(InstructionRepository);
     this.repository(StepRepository);
-    this.repository(UserGroupRepository);
     this.repository(UserLinkRepository);
-    this.repository(GroupRepository);
     this.dataSource(DbDataSource);
 
     this.bind('services.jwt.service').toClass(JWTService);

diff --git a/src/controllers/index.ts b/src/controllers/index.ts
@@ -2,3 +2,4 @@ export * from './instruction-step.controller';
 export * from './ping.controller';
 export * from './user-instruction.controller';
 export * from './user.controller';
+export * from './user-link.controller';