fix: seperate content price to model collection

myriadsocial · Dec 8, 2022 · e382298 · e382298
1 parent 8c6c901
commit e382298
Show file tree

Hide file tree

Showing 12 changed files with 217 additions and 62 deletions.
diff --git a/src/__tests__/helpers/database.helper.ts b/src/__tests__/helpers/database.helper.ts
@@ -33,6 +33,7 @@ import {
   UserOTPRepository,
   IdentityRepository,
   UnlockableContentRepository,
+  ContentPriceRepository,
 } from '../../repositories';
 import {
   ActivityLogService,
@@ -103,8 +104,18 @@ export async function givenRepositories(testdb: any) {
     async () => postRepository,
     async () => userRepository,
   );
+  const contentPriceRepository: ContentPriceRepository =
+    new ContentPriceRepository(
+      testdb,
+      async () => currencyRepository,
+      async () => unlockableContentRepository,
+    );
   const unlockableContentRepository: UnlockableContentRepository =
-    new UnlockableContentRepository(testdb, async () => userRepository);
+    new UnlockableContentRepository(
+      testdb,
+      async () => userRepository,
+      async () => contentPriceRepository,
+    );
   const postRepository: PostRepository = new PostRepository(
     testdb,
     async () => peopleRepository,
@@ -321,6 +332,7 @@ export async function givenRepositories(testdb: any) {
   );
 
   const transactionService = new TransactionService(
+    contentPriceRepository,
     currencyRepository,
     peopleRepository,
     transactionRepository,
@@ -415,6 +427,7 @@ export async function givenRepositories(testdb: any) {
   );
 
   const userService = new UserService(
+    contentPriceRepository,
     changeEmailRequestRepository,
     experienceRepository,
     identityRepository,
@@ -484,6 +497,7 @@ export async function givenRepositories(testdb: any) {
     socialMediaService,
     tagService,
     unlockableContentRepository,
+    contentPriceRepository,
   };
 }
 
@@ -513,6 +527,7 @@ export async function givenEmptyDatabase(testdb: any) {
     userCurrencyRepository,
     serverRepository,
     unlockableContentRepository,
+    contentPriceRepository,
   } = await givenRepositories(testdb);
 
   await tagRepository.deleteAll();
@@ -539,4 +554,5 @@ export async function givenEmptyDatabase(testdb: any) {
   await userCurrencyRepository.deleteAll();
   await serverRepository.deleteAll();
   await unlockableContentRepository.deleteAll();
+  await contentPriceRepository.deleteAll();
 }
diff --git a/src/controllers/user/unlockable-content.controller.ts b/src/controllers/user/unlockable-content.controller.ts
@@ -16,7 +16,7 @@ import {
   response,
 } from '@loopback/rest';
 import {PaginationInterceptor} from '../../interceptors';
-import {UnlockableContent} from '../../models';
+import {UnlockableContent, UnlockableContentWithPrice} from '../../models';
 import {UserService} from '../../services';
 
 @authenticate('jwt')
@@ -30,21 +30,21 @@ export class UserUnlockableContentController {
   @response(200, {
     description: 'CREATE user unlockable-content',
     'application/json': {
-      schema: getModelSchemaRef(UnlockableContent),
+      schema: getModelSchemaRef(UnlockableContentWithPrice),
     },
   })
   async create(
     @requestBody({
       content: {
         'application/json': {
-          schema: getModelSchemaRef(UnlockableContent, {
+          schema: getModelSchemaRef(UnlockableContentWithPrice, {
             title: 'NewUnlockableContent',
             exclude: ['id'],
           }),
         },
       },
     })
-    content: Omit<UnlockableContent, 'id'>,
+    content: Omit<UnlockableContentWithPrice, 'id'>,
   ): Promise<UnlockableContent> {
     return this.userService.createUnlockableContent(content);
   }

diff --git a/src/models/content-price.model.ts b/src/models/content-price.model.ts
@@ -0,0 +1,45 @@
+import {Entity, model, property, belongsTo} from '@loopback/repository';
+import {Currency} from './currency.model';
+import {UnlockableContent} from './unlockable-content.model';
+
+@model({
+  settings: {
+    strictObjectIDCoercion: true,
+    mongodb: {
+      collection: 'contentPrices',
+    },
+  },
+})
+export class ContentPrice extends Entity {
+  @property({
+    type: 'string',
+    id: true,
+    generated: true,
+    mongodb: {
+      dataType: 'ObjectId',
+    },
+  })
+  id: string;
+
+  @property({
+    type: 'number',
+    required: true,
+  })
+  amount: number;
+
+  @belongsTo(() => Currency)
+  currencyId: string;
+
+  @belongsTo(() => UnlockableContent)
+  unlockableContentId: string;
+
+  constructor(data?: Partial<ContentPrice>) {
+    super(data);
+  }
+}
+
+export interface ContentPriceRelations {
+  // describe navigational properties here
+}
+
+export type ContentPriceWithRelations = ContentPrice & ContentPriceRelations;
diff --git a/src/models/index.ts b/src/models/index.ts
@@ -46,3 +46,4 @@ export * from './user-personal-access-token.model';
 export * from './user.model';
 export * from './vote.model';
 export * from './wallet.model';
+export * from './content-price.model';
diff --git a/src/models/unlockable-content.model.ts b/src/models/unlockable-content.model.ts
@@ -4,13 +4,10 @@ import {
   model,
   property,
   belongsTo,
+  hasMany,
 } from '@loopback/repository';
-import {Currency} from './currency.model';
 import {User, UserWithRelations} from './user.model';
-
-type Price = Currency & {
-  amount: string;
-};
+import {ContentPrice} from './content-price.model';
 
 @model({
   settings: {
@@ -46,13 +43,6 @@ export class UnlockableContent extends Entity {
   })
   content?: AnyObject;
 
-  @property({
-    type: 'array',
-    itemType: 'object',
-    required: true,
-  })
-  prices: Price[];
-
   @property({
     type: 'date',
     required: false,
@@ -73,6 +63,9 @@ export class UnlockableContent extends Entity {
   })
   deletedAt?: string;
 
+  @hasMany(() => ContentPrice)
+  prices: ContentPrice[];
+
   @belongsTo(() => User, {name: 'user'})
   createdBy: string;
 
@@ -88,3 +81,17 @@ export interface UnlockableContentRelations {
 
 export type UnlockableContentWithRelations = UnlockableContent &
   UnlockableContentRelations;
+
+export interface Price {
+  currencyId: string;
+  amount: number;
+}
+
+export class UnlockableContentWithPrice extends UnlockableContent {
+  @property({
+    type: 'array',
+    itemType: 'object',
+    required: false,
+  })
+  contentPrices: Price[];
+}
diff --git a/src/repositories/content-price.repository.ts b/src/repositories/content-price.repository.ts
@@ -0,0 +1,54 @@
+import {inject, Getter} from '@loopback/core';
+import {
+  DefaultCrudRepository,
+  repository,
+  BelongsToAccessor,
+} from '@loopback/repository';
+import {MongoDataSource} from '../datasources';
+import {
+  ContentPrice,
+  ContentPriceRelations,
+  Currency,
+  UnlockableContent,
+} from '../models';
+import {CurrencyRepository} from './currency.repository';
+import {UnlockableContentRepository} from './unlockable-content.repository';
+
+export class ContentPriceRepository extends DefaultCrudRepository<
+  ContentPrice,
+  typeof ContentPrice.prototype.id,
+  ContentPriceRelations
+> {
+  public readonly currency: BelongsToAccessor<
+    Currency,
+    typeof ContentPrice.prototype.id
+  >;
+
+  public readonly unlockableContent: BelongsToAccessor<
+    UnlockableContent,
+    typeof ContentPrice.prototype.id
+  >;
+
+  constructor(
+    @inject('datasources.mongo') dataSource: MongoDataSource,
+    @repository.getter('CurrencyRepository')
+    protected currencyRepositoryGetter: Getter<CurrencyRepository>,
+    @repository.getter('UnlockableContentRepository')
+    protected unlockableContentRepositoryGetter: Getter<UnlockableContentRepository>,
+  ) {
+    super(ContentPrice, dataSource);
+    this.unlockableContent = this.createBelongsToAccessorFor(
+      'unlockableContent',
+      unlockableContentRepositoryGetter,
+    );
+    this.registerInclusionResolver(
+      'unlockableContent',
+      this.unlockableContent.inclusionResolver,
+    );
+    this.currency = this.createBelongsToAccessorFor(
+      'currency',
+      currencyRepositoryGetter,
+    );
+    this.registerInclusionResolver('currency', this.currency.inclusionResolver);
+  }
+}
diff --git a/src/repositories/index.ts b/src/repositories/index.ts
@@ -34,3 +34,4 @@ export * from './user-otp.repository';
 export * from './user-personal-access-token.repository';
 export * from './change-email-request.repository';
 export * from './request-create-new-user-by-email.repository';
+export * from './content-price.repository';
diff --git a/src/repositories/unlockable-content.repository.ts b/src/repositories/unlockable-content.repository.ts
@@ -3,10 +3,17 @@ import {
   DefaultCrudRepository,
   repository,
   BelongsToAccessor,
+  HasManyRepositoryFactory,
 } from '@loopback/repository';
 import {MongoDataSource} from '../datasources';
-import {UnlockableContent, UnlockableContentRelations, User} from '../models';
+import {
+  UnlockableContent,
+  UnlockableContentRelations,
+  User,
+  ContentPrice,
+} from '../models';
 import {UserRepository} from './user.repository';
+import {ContentPriceRepository} from './content-price.repository';
 
 export class UnlockableContentRepository extends DefaultCrudRepository<
   UnlockableContent,
@@ -18,12 +25,24 @@ export class UnlockableContentRepository extends DefaultCrudRepository<
     typeof UnlockableContent.prototype.id
   >;
 
+  public readonly prices: HasManyRepositoryFactory<
+    ContentPrice,
+    typeof UnlockableContent.prototype.id
+  >;
+
   constructor(
     @inject('datasources.mongo') dataSource: MongoDataSource,
     @repository.getter('UserRepository')
     protected userRepositoryGetter: Getter<UserRepository>,
+    @repository.getter('ContentPriceRepository')
+    protected contentPriceRepositoryGetter: Getter<ContentPriceRepository>,
   ) {
     super(UnlockableContent, dataSource);
+    this.prices = this.createHasManyRepositoryFactoryFor(
+      'prices',
+      contentPriceRepositoryGetter,
+    );
+    this.registerInclusionResolver('prices', this.prices.inclusionResolver);
     this.user = this.createBelongsToAccessorFor('user', userRepositoryGetter);
     this.registerInclusionResolver('user', this.user.inclusionResolver);
   }

diff --git a/src/services/filter-builder.service.ts b/src/services/filter-builder.service.ts
@@ -203,30 +203,6 @@ export class FilterBuilderService {
     return this.finalizeFilter(filter, {userId, networkId});
   }
 
-  public async userExperienceById(args: InvocationArgs): Promise<void> {
-    const filter = args[1] ?? {};
-    const include = [
-      {
-        relation: 'experience',
-        scope: {
-          include: [
-            {
-              relation: 'user',
-              scope: {
-                include: [{relation: 'accountSetting'}],
-              },
-            },
-          ],
-        },
-      },
-    ];
-
-    if (!filter.include) filter.include = include;
-    else filter.include.push(...include);
-
-    args[1] = filter;
-  }
-
   public async userFriend(
     filter: Filter<Friend>,
     query: Query,
@@ -348,6 +324,30 @@ export class FilterBuilderService {
     return this.finalizeFilter(filter, where);
   }
 
+  public async userExperienceById(args: InvocationArgs): Promise<void> {
+    const filter = args[1] ?? {};
+    const include = [
+      {
+        relation: 'experience',
+        scope: {
+          include: [
+            {
+              relation: 'user',
+              scope: {
+                include: [{relation: 'accountSetting'}],
+              },
+            },
+          ],
+        },
+      },
+    ];
+
+    if (!filter.include) filter.include = include;
+    else filter.include.push(...include);
+
+    args[1] = filter;
+  }
+
   public async userPostById(args: InvocationArgs): Promise<void> {
     const filter = args[1] ?? {};
     const experienceFilter = {