edits

Selecro · Sep 14, 2023 · e3b2563 · e3b2563
1 parent faf3c42
commit e3b2563
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 32 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}', {

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,10 +663,13 @@ 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/controllers/user-progress.controller.ts b/src/controllers/user-progress.controller.ts
@@ -1,22 +1,22 @@
 import {authenticate} from '@loopback/authentication';
 import {inject} from '@loopback/core';
-import {
-  repository
-} from '@loopback/repository';
+import {repository} from '@loopback/repository';
 import {
   HttpErrors,
   del,
   get,
   param,
   patch,
   post,
-  requestBody
+  requestBody,
 } from '@loopback/rest';
 import {SecurityBindings, UserProfile} from '@loopback/security';
+import {Progress, ProgressRelations} from '../models';
 import {
-  Progress, ProgressRelations
-} from '../models';
-import {InstructionRepository, ProgressRepository, UserRepository} from '../repositories';
+  InstructionRepository,
+  ProgressRepository,
+  UserRepository,
+} from '../repositories';
 import {JWTService} from '../services';
 
 export class UserProgressController {
@@ -28,8 +28,9 @@ export class UserProgressController {
     @repository(InstructionRepository)
     protected instructionRepository: InstructionRepository,
     @repository(UserRepository) protected userRepository: UserRepository,
-    @repository(UserRepository) protected progressRepository: ProgressRepository,
-  ) { }
+    @repository(UserRepository)
+    protected progressRepository: ProgressRepository,
+  ) {}
 
   @authenticate('jwt')
   @post('/users/{id}/progresses/{progressId}', {
@@ -57,11 +58,7 @@ export class UserProgressController {
               stepId: {type: 'number'},
               descriptionId: {type: 'number'},
             },
-            required: [
-              'instructionId',
-              'stepId',
-              'descriptionId',
-            ],
+            required: ['instructionId', 'stepId', 'descriptionId'],
           },
         },
       },
@@ -83,7 +80,7 @@ export class UserProgressController {
         'Progress with this instructionId and userId already exists.',
       );
     }
-    this.progressRepository.create({
+    await this.progressRepository.create({
       ...progress,
       userId: this.user.id,
     });
@@ -129,7 +126,7 @@ export class UserProgressController {
     const progressOriginal = await this.progressRepository.findOne({
       where: {
         instructionId: instructionId,
-        userId: this.user.id
+        userId: this.user.id,
       },
     });
     if (!progressOriginal) {
@@ -165,7 +162,7 @@ export class UserProgressController {
     const progress = await this.progressRepository.findOne({
       where: {
         instructionId: instructionId,
-        userId: this.user.id
+        userId: this.user.id,
       },
     });
     if (!progress) {
@@ -200,7 +197,7 @@ export class UserProgressController {
   })
   async find(
     @param.path.number('instructionId') instructionId: number,
-  ): Promise<(Progress & ProgressRelations)> {
+  ): Promise<Progress & ProgressRelations> {
     const user = await this.userRepository.findById(this.user.id);
     if (!user) {
       throw new HttpErrors.NotFound('User not found');
@@ -219,9 +216,7 @@ export class UserProgressController {
 
   private validateProgressOwnership(progress: Progress): void {
     if (Number(progress.userId) !== Number(this.user.id)) {
-      throw new HttpErrors.Forbidden(
-        'You are not authorized to this progress',
-      );
+      throw new HttpErrors.Forbidden('You are not authorized to this progress');
     }
   }
 }
diff --git a/src/repositories/progress.repository.ts b/src/repositories/progress.repository.ts
@@ -8,9 +8,7 @@ export class ProgressRepository extends DefaultCrudRepository<
   typeof Progress.prototype.id,
   ProgressRelations
 > {
-  constructor(
-    @inject('datasources.db') dataSource: DbDataSource,
-  ) {
+  constructor(@inject('datasources.db') dataSource: DbDataSource) {
     super(Progress, dataSource);
   }
 }
diff --git a/src/repositories/user.repository.ts b/src/repositories/user.repository.ts
@@ -19,16 +19,27 @@ export class UserRepository extends DefaultCrudRepository<
     typeof User.prototype.id
   >;
 
-  public readonly progresses: HasManyRepositoryFactory<Progress, typeof User.prototype.id>;
+  public readonly progresses: HasManyRepositoryFactory<
+    Progress,
+    typeof User.prototype.id
+  >;
 
   constructor(
     @inject('datasources.db') dataSource: DbDataSource,
     @repository.getter('InstructionRepository')
-    protected instructionRepositoryGetter: Getter<InstructionRepository>, @repository.getter('ProgressRepository') protected progressRepositoryGetter: Getter<ProgressRepository>,
+    protected instructionRepositoryGetter: Getter<InstructionRepository>,
+    @repository.getter('ProgressRepository')
+    protected progressRepositoryGetter: Getter<ProgressRepository>,
   ) {
     super(User, dataSource);
-    this.progresses = this.createHasManyRepositoryFactoryFor('progresses', progressRepositoryGetter,);
-    this.registerInclusionResolver('progresses', this.progresses.inclusionResolver);
+    this.progresses = this.createHasManyRepositoryFactoryFor(
+      'progresses',
+      progressRepositoryGetter,
+    );
+    this.registerInclusionResolver(
+      'progresses',
+      this.progresses.inclusionResolver,
+    );
     this.instructions = this.createHasManyRepositoryFactoryFor(
       'instructions',
       instructionRepositoryGetter,