Adding more tests for flyers and magazines

cuappdev · Nov 21, 2023 · cdd926a · cdd926a
1 parent 496e839
commit cdd926a
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 12 deletions.
diff --git a/src/entities/User.ts b/src/entities/User.ts
@@ -60,11 +60,11 @@ export class User {
   bookmarkedArticles: mongoose.Types.DocumentArray<DocumentType<Article>>;
 
   @Field((type) => [Magazine])
-  @Property({ required: true, type: () => String, default: [] })
+  @Property({ required: true, type: () => Magazine, default: [] })
   bookmarkedMagazines: mongoose.Types.DocumentArray<DocumentType<Magazine>>;
 
   @Field((type) => [Flyer])
-  @Property({ required: true, type: () => String, default: [] })
+  @Property({ required: true, type: () => Flyer, default: [] })
   bookmarkedFlyers: mongoose.Types.DocumentArray<DocumentType<Flyer>>;
 
   @Field({ nullable: true })

diff --git a/src/repos/MagazineRepo.ts b/src/repos/MagazineRepo.ts
@@ -79,14 +79,14 @@ const getMagazinesByPublicationSlugs = async (
     });
 };
 
-function getMagazineByID(id: string) {
-  return MagazineModel.findById(id).then((magazine) => {
+const getMagazineByID = async (id: string): Promise<Magazine> => {
+  return MagazineModel.findById(new ObjectId(id)).then((magazine) => {
     if (!isMagazineFiltered(magazine)) {
       return magazine;
     }
     return null;
   });
-}
+};
 
 function getMagazinesByIDs(ids: string[]) {
   return Promise.all(ids.map((id) => MagazineModel.findById(new ObjectId(id)))).then(

diff --git a/src/tests/user.test.ts b/src/tests/user.test.ts
@@ -239,10 +239,15 @@ describe('(un)bookmark tests:', () => {
     await UserRepo.bookmarkArticle(users[0].uuid, insertOutput[0].id);
 
     // update database
-    const pub = await PublicationFactory.getRandomPublication();
-    await UserRepo.followPublication(users[0].uuid, pub.slug);
+    const pub1 = await PublicationFactory.getRandomPublication();
+    await UserRepo.followPublication(users[0].uuid, pub1.slug);
 
     await UserRepo.unbookmarkArticle(users[0].uuid, insertOutput[0].id);
+
+    // update database
+    const pub2 = await PublicationFactory.getRandomPublication();
+    await UserRepo.followPublication(users[0].uuid, pub2.slug);
+
     const getUserResponse = await UserRepo.getUserByUUID(users[0].uuid);
     expect(getUserResponse.bookmarkedArticles).toHaveLength(0);
   });
@@ -251,10 +256,19 @@ describe('(un)bookmark tests:', () => {
     const users = await UserFactory.create(1);
     const articles = await ArticleFactory.create(1);
     await UserModel.insertMany(users);
-    await ArticleModel.insertMany(articles);
+    const insertOutput = await ArticleModel.insertMany(articles);
+    await UserRepo.bookmarkArticle(users[0].uuid, insertOutput[0].id);
+
+    // update database
+    const pub1 = await PublicationFactory.getRandomPublication();
+    await UserRepo.followPublication(users[0].uuid, pub1.slug);
+
+    await UserRepo.bookmarkArticle(users[0].uuid, insertOutput[0].id);
+
+    // update database
+    const pub2 = await PublicationFactory.getRandomPublication();
+    await UserRepo.followPublication(users[0].uuid, pub2.slug);
 
-    await UserRepo.bookmarkArticle(users[0].uuid, articles[0].id);
-    await UserRepo.bookmarkArticle(users[0].uuid, articles[0].id);
     const getUserResponse = await UserRepo.getUserByUUID(users[0].uuid);
     expect(getUserResponse.bookmarkedArticles).toHaveLength(1);
   });
@@ -263,9 +277,13 @@ describe('(un)bookmark tests:', () => {
     const users = await UserFactory.create(1);
     const articles = await ArticleFactory.create(1);
     await UserModel.insertMany(users);
-    await ArticleModel.insertMany(articles);
+    const insertOutput = await ArticleModel.insertMany(articles);
 
-    await UserRepo.unbookmarkArticle(users[0].uuid, articles[0].id);
+    // update database
+    const pub = await PublicationFactory.getRandomPublication();
+    await UserRepo.followPublication(users[0].uuid, pub.slug);
+
+    await UserRepo.unbookmarkArticle(users[0].uuid, insertOutput[0].id);
     const getUserResponse = await UserRepo.getUserByUUID(users[0].uuid);
     expect(getUserResponse.bookmarkedArticles).toHaveLength(0);
   });