Merge branch 'main' into release-please--branches--main--components--myriad-api

Author: irmannmal

src/__tests__/helpers/database.helper.ts

@@ -86,6 +86,7 @@ export async function givenRepositories(testdb: any) {
     async () => walletRepository,
     async () => userCurrencyRepository,
     async () => currencyRepository,
+    async () => postRepository,
   );
   const userExperienceRepository: UserExperienceRepository =
     new UserExperienceRepository(

src/datasources/twitter.datasource.ts

@@ -5,7 +5,7 @@ import {config} from '../config';
 const twitterConfig = {
   name: 'twitter',
   connector: 'rest',
-  baseURL: 'https://api.twitter.com/2/',
+  baseURL: 'https://api.twitter.com/',
   crud: false,
   options: {
     headers: {
@@ -16,7 +16,7 @@ const twitterConfig = {
     {
       template: {
         method: 'GET',
-        url: 'https://api.twitter.com/2/{action}',
+        url: 'https://api.twitter.com/{action}',
       },
       functions: {
         getActions: ['action'],

src/models/user.model.ts

@@ -23,6 +23,7 @@ import {UserCurrency} from './user-currency.model';
 import {UserExperience} from './user-experience.model';
 import {UserSocialMedia} from './user-social-media.model';
 import {Wallet, WalletWithRelations} from './wallet.model';
+import {Post} from './post.model';
 
 @model({
   settings: {
@@ -236,6 +237,9 @@ export class User extends Entity {
   @hasMany(() => UserCurrency)
   userCurrencies: UserCurrency[];
 
+  @hasMany(() => Post, {keyTo: 'createdBy'})
+  posts: Post[];
+
   constructor(data?: Partial<User>) {
     super(data);
   }

src/repositories/user.repository.ts

@@ -17,6 +17,7 @@ import {
   LanguageSetting,
   NotificationSetting,
   People,
+  Post,
   User,
   UserCurrency,
   UserExperience,
@@ -36,6 +37,7 @@ import {UserCurrencyRepository} from './user-currency.repository';
 import {UserExperienceRepository} from './user-experience.repository';
 import {UserSocialMediaRepository} from './user-social-media.repository';
 import {WalletRepository} from './wallet.repository';
+import {PostRepository} from './post.repository';
 
 @bind({scope: BindingScope.SINGLETON})
 export class UserRepository extends DefaultCrudRepository<
@@ -104,6 +106,11 @@ export class UserRepository extends DefaultCrudRepository<
     typeof User.prototype.id
   >;
 
+  public readonly posts: HasManyRepositoryFactory<
+    Post,
+    typeof User.prototype.id
+  >;
+
   constructor(
     @inject('datasources.mongo') dataSource: MongoDataSource,
     @repository.getter('UserSocialMediaRepository')
@@ -130,6 +137,8 @@ export class UserRepository extends DefaultCrudRepository<
     protected userCurrencyRepositoryGetter: Getter<UserCurrencyRepository>,
     @repository.getter('CurrencyRepository')
     protected currencyRepositoryGetter: Getter<CurrencyRepository>,
+    @repository.getter('PostRepository')
+    protected postRepositoryGetter: Getter<PostRepository>,
   ) {
     super(User, dataSource);
     this.userCurrencies = this.createHasManyRepositoryFactoryFor(
@@ -192,6 +201,11 @@ export class UserRepository extends DefaultCrudRepository<
       friendRepositoryGetter,
     );
     this.registerInclusionResolver('friends', this.friends.inclusionResolver);
+    this.posts = this.createHasManyRepositoryFactoryFor(
+      'posts',
+      postRepositoryGetter,
+    );
+    this.registerInclusionResolver('posts', this.posts.inclusionResolver);
     this.activityLogs = this.createHasManyRepositoryFactoryFor(
       'activityLogs',
       activityLogRepositoryGetter,

src/services/user.service.ts

@@ -793,16 +793,7 @@ export class UserService {
     id: string,
     filter?: Filter<Post>,
   ): Promise<Post[]> {
-    const newFilter: Filter<Post> = {
-      ...filter,
-      where: {createdBy: id},
-    };
-    return this.postService.find(
-      newFilter,
-      undefined,
-      true,
-      this.currentUser[securityId],
-    );
+    return this.userRepository.posts(id).find(filter);
   }
 
   public async draftPost(): Promise<DraftPost | null> {