chore: fix tests

Author: mateusz-kleszcz

server/src/controllers/__tests__/client.controller.test.ts

@@ -130,7 +130,10 @@ describe('Client controller', () => {
           },
           threadOf: {
             populate: {
-              authorUser: true
+              authorUser: {
+                populate: true,
+                avatar: { populate: true },
+              },
             }
           }
         }
@@ -179,7 +182,10 @@ describe('Client controller', () => {
           },
           threadOf: {
             populate: {
-              authorUser: true
+              authorUser: {
+                populate: true,
+                avatar: { populate: true },
+              },
             }
           }
         }
@@ -222,7 +228,10 @@ describe('Client controller', () => {
           },
           threadOf: {
             populate: {
-              authorUser: true
+              authorUser: {
+                populate: true,
+                avatar: { populate: true },
+              },
             }
           }
         }
@@ -259,7 +268,10 @@ describe('Client controller', () => {
           },
           threadOf: {
             populate: {
-              authorUser: true
+              authorUser: {
+                populate: true,
+                avatar: { populate: true },
+              },
             }
           }
         }

server/src/controllers/__tests__/utils/parser.test.ts

@@ -20,7 +20,12 @@ describe('Parser', () => {
           },
           threadOf: {
             populate: {
-              authorUser: true,
+              authorUser: {
+                populate: true,
+                avatar: {
+                  populate: true,
+                }
+              },
             },
           },
         },
@@ -77,7 +82,10 @@ describe('Parser', () => {
           },
           threadOf: {
             populate: {
-              authorUser: true,
+              authorUser: {
+                populate: true,
+                avatar: { populate: true },
+              },
             },
           },
         },
@@ -134,7 +142,10 @@ describe('Parser', () => {
           },
           threadOf: {
             populate: {
-              authorUser: true,
+              authorUser: {
+                populate: true,
+                avatar: { populate: true },
+              },
             },
           },
         },
@@ -203,7 +214,10 @@ describe('Parser', () => {
           },
           threadOf: {
             populate: {
-              authorUser: true,
+              authorUser: {
+                populate: true,
+                avatar: { populate: true },
+              },
             },
           },
         },
@@ -242,7 +256,10 @@ describe('Parser', () => {
           },
           threadOf: {
             populate: {
-              authorUser: true,
+              authorUser: {
+                populate: true,
+                avatar: { populate: true },
+              },
             },
           },
         },
@@ -287,7 +304,10 @@ describe('Parser', () => {
           },
           threadOf: {
             populate: {
-              authorUser: true,
+              authorUser: {
+                populate: true,
+                avatar: { populate: true },
+              },
             },
           },
         },

server/src/services/__tests__/common.service.test.ts

@@ -503,7 +503,12 @@ describe('common.service', () => {
       expect(mockCommentRepository.findWithCount).toHaveBeenCalledWith({
         pageSize: 10, 
         page: 1,
-        populate: { authorUser: { populate: ['avatar'] } }, 
+        populate: { 
+          authorUser: {
+            populate: true,
+            avatar: { populate: true },
+          }, 
+        }, 
         select: ["id", "content", "related"],
         orderBy: { createdAt: "desc" },
         where: { authorId: 1 }
@@ -550,7 +555,10 @@ describe('common.service', () => {
         select: ['id', 'content', 'related'],
         orderBy: { createdAt: 'desc' },
         populate: {
-          authorUser: { populate: ['avatar'] },
+          authorUser: {
+            populate: true,
+            avatar: { populate: true },
+          },
         },
       });
     });

server/src/services/common.service.ts

@@ -86,8 +86,11 @@ const commonService = ({ strapi }: StrapiContext) => ({
     const omit = baseOmit.filter((field) => !REQUIRED_FIELDS.includes(field));
     const defaultSelect = (['id', 'related'] as const).filter((field) => !omit.includes(field));
 
-    const populateClause = {
-      authorUser: { populate: ['avatar'] },
+    const populateClause: clientValidator.FindAllFlatSchema['populate'] = {
+      authorUser: { 
+        populate: true,
+        avatar: { populate: true } 
+      },
       ...(isObject(populate) ? populate : {}),
     };
     const doNotPopulateAuthor = isAdmin ? [] : await this.getConfig(CONFIG_PARAMS.AUTHOR_BLOCKED_PROPS, []);
@@ -136,7 +139,7 @@ const commonService = ({ strapi }: StrapiContext) => ({
 
       let authorUserPopulate = {};
       if (isObject(populate?.authorUser)) {
-        authorUserPopulate = 'populate' in populateClause.authorUser ? (populateClause.authorUser.populate) : populateClause.authorUser;
+        authorUserPopulate = 'populate' in populate.authorUser ? (populate.authorUser.populate) : populateClause.authorUser;
       }
 
       const primitiveThreadOf = typeof parsedThreadOf === 'number' ? parsedThreadOf : null;