fix: organisation test

hngprojects · Mar 3, 2025 · 2538a23 · 2538a23
1 parent ae08b28
commit 2538a23
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 11 deletions.
diff --git a/src/modules/organisations/organisations.service.ts b/src/modules/organisations/organisations.service.ts
@@ -157,11 +157,8 @@ export class OrganisationsService {
 
   async getUserOrganisations(userId: string, page: number = 1, page_size: number = 10) {
     // const organisations = await this.getAllUserOrganisations(userId);
-    const [organisations, total_count] = await this.organisationRepository.findAndCount({
-      where: { isDeleted: false },
-      skip: (page - 1) * page_size,
-      take: page_size,
-    });
+    const organisations = await this.organisationRepository.findBy({ isDeleted: false });
+    const total_count = organisations.length;
 
     return {
       status_code: HttpStatus.OK,

diff --git a/src/modules/organisations/tests/organisations.service.spec.ts b/src/modules/organisations/tests/organisations.service.spec.ts
@@ -263,10 +263,6 @@ describe('OrganisationsService', () => {
   });
 
   describe('deleteorganisation', () => {
-    beforeAll(() => {
-      console.log(Object.keys(organisationRepository));
-    });
-
     it('should mark an organisation as deleted', async () => {
       const orgId = 'org-id';
 
@@ -315,7 +311,7 @@ describe('OrganisationsService', () => {
     });
 
     it('should exclude deleted organisations from queries', async () => {
-      organisationRepository.findAndCount = jest.fn().mockResolvedValue([[], 0]);
+      organisationRepository.findBy = jest.fn().mockResolvedValue([]);
 
       const result = await service.getUserOrganisations('user-id');
 
@@ -331,7 +327,7 @@ describe('OrganisationsService', () => {
       });
 
       // ✅ Fix expectation
-      expect(organisationRepository.findAndCountBy).toHaveBeenCalledWith({
+      expect(organisationRepository.findBy).toHaveBeenCalledWith({
         isDeleted: false,
       });
     });