optional parameter

Selecro · Sep 11, 2023 · 84d000b · 84d000b
1 parent bbd97ae
commit 84d000b
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 8 deletions.
diff --git a/src/controllers/instruction-step.controller.ts b/src/controllers/instruction-step.controller.ts
@@ -31,7 +31,7 @@ export class InstructionStepController {
     @repository(InstructionRepository)
     public instructionRepository: InstructionRepository,
     @repository(StepRepository) public stepRepository: StepRepository,
-  ) {}
+  ) { }
 
   @authenticate('jwt')
   @post('/users/{id}/instructions/{instructionId}/steps/{stepId}', {
@@ -416,6 +416,11 @@ export class InstructionStepController {
     if (!instruction) {
       throw new HttpErrors.NotFound('Instruction not found');
     }
+    if (!instruction.premiumUserIds) {
+      throw new HttpErrors.Forbidden(
+        'You are not authorized to this instruction',
+      );
+    }
     if (!instruction.premiumUserIds.includes(this.user.id)) {
       throw new HttpErrors.Forbidden(
         'You are not authorized to this instruction',

diff --git a/src/controllers/user-instruction.controller.ts b/src/controllers/user-instruction.controller.ts
@@ -38,7 +38,7 @@ export class UserInstructionController {
     @repository(InstructionRepository)
     protected instructionRepository: InstructionRepository,
     @repository(StepRepository) public stepRepository: StepRepository,
-  ) {}
+  ) { }
 
   @authenticate('jwt')
   @post('/users/{id}/instructions/{instructionId}', {
@@ -663,12 +663,10 @@ export class UserInstructionController {
     if (!keyMatch) {
       throw new HttpErrors.Unauthorized('Invalid password');
     }
-    const instruction =
-      await this.instructionRepository.findById(instructionId);
+    const instruction = await this.instructionRepository.findById(instructionId);
+    instruction.premiumUserIds = instruction.premiumUserIds ?? [];
     if (instruction.premiumUserIds.includes(userId)) {
-      instruction.premiumUserIds = instruction.premiumUserIds.filter(
-        id => id !== userId,
-      );
+      instruction.premiumUserIds = instruction.premiumUserIds.filter(id => id !== userId);
     } else {
       instruction.premiumUserIds.push(userId);
     }

diff --git a/src/models/instruction.model.ts b/src/models/instruction.model.ts
@@ -145,7 +145,7 @@ export class Instruction extends Entity {
     },
     default: () => [],
   })
-  premiumUserIds: number[];
+  premiumUserIds?: number[];
 
   @property({
     type: 'number',