feat: Introducing Admin Module to Backend (HBE-83) (#21)
* feat: introducing admin module, resolvers and service files as a module * feat: adding admin module in the app module * feat: introducing admin guard and decorator for allowing admin operations * feat: invited user model * chore: added user invitation mail description to mailer service * chore: added admin and user related error * feat: added invited users as a new model in prisma * chore: added admin related topics to pubsub * chore: added service method to fetch all users from user table * chore: added user deletion base implementation * Revert "chore: added user deletion base implementation" This reverts commit d1615ad83db2bae946e2d366a903d2f95051dabb. * feat: adding team related operations to admin * chore: adding admin related service methods to teams module service * chore: adding admin related service methods to team coll invitations requests envs * chore: added more module error messages * chore: added admin check service method * chore: added find individual user by UID in admin * HBE-106 feat: introduced code to handle first time admin login setup (#23) * test: wrote test cases for verifyAdmin route service method * chore: added comments to verifyAdmin service method * chore: deleted the prisma migration file * chore: added find admin users * feat: added user deletion into admin module * chore: admin user related errors * chore: fixed registry pattern in the shortcodes and teams to handle user deletion * chore: add subscription topic for user deletion * chore: updated user type in data handler * feat: implement and fix user deletion * feat: added make user admin mutation * chore: added unit tests for admin specific service methods in admin module * chore: added invitation not found error * chore: added admin specific operation test cases in specific modules * chore: added tests related to user deletion and admin related operation in user module * chore: updated to error constant when invitations not found * chore: fix rebase overwritten methods * feat: implement remove user as admin * chore: add new line * feat: introducing basic metrics into the self-hosted admin module (HBE-104) (#43) * feat: introducing admin module, resolvers and service files as a module * feat: adding admin module in the app module * feat: introducing admin guard and decorator for allowing admin operations * feat: invited user model * chore: added user invitation mail description to mailer service * chore: added admin and user related error * feat: added invited users as a new model in prisma * chore: added admin related topics to pubsub * chore: added service method to fetch all users from user table * chore: added user deletion base implementation * Revert "chore: added user deletion base implementation" This reverts commit d1615ad83db2bae946e2d366a903d2f95051dabb. * feat: adding team related operations to admin * chore: adding admin related service methods to teams module service * chore: adding admin related service methods to team coll invitations requests envs * chore: added more module error messages * chore: added admin check service method * chore: added find individual user by UID in admin * HBE-106 feat: introduced code to handle first time admin login setup (#23) * test: wrote test cases for verifyAdmin route service method * chore: added comments to verifyAdmin service method * chore: deleted the prisma migration file * chore: added find admin users * feat: added user deletion into admin module * chore: admin user related errors * chore: fixed registry pattern in the shortcodes and teams to handle user deletion * chore: add subscription topic for user deletion * chore: updated user type in data handler * feat: implement and fix user deletion * feat: added make user admin mutation * chore: added unit tests for admin specific service methods in admin module * chore: added invitation not found error * chore: added admin specific operation test cases in specific modules * chore: added tests related to user deletion and admin related operation in user module * chore: updated to error constant when invitations not found * chore: fix rebase overwritten methods * feat: implement remove user as admin * chore: add new line * chore: created new GQL return type for admin module * chore: created resolver and service method for method to fetch org metrics * chore: removed all entities relevant to seperate query for fetching admin metrics * chore: created all resolvers for metrics * feat: completed adding field resolves to query org metrics * test: wrote tests for all metrics related methods in admin module * test: added test cases for get count functions in multiple modules * chore: removed prisma migration folder * Delete backend-schema.gql * chore: resolved merge conflicts in team test file --------- Co-authored-by: ankitsridhar16 <ankit.sridhar16@gmail.com> * refactor: update mailer service to stop using postmark (#38) * refactor: update mailer service to stop using postmark * chore: remove postmark as a dep and move out postmark code * chore: remove postmark variables from .env.example * chore: add formal errors for mailer initialization errors * chore: add and update jsdoc comments in mailer service methods * chore: added user invitation mail description to mailer service * chore: updated with review changes requested for admin module * feat: adding admin resolver to gql schema * feat: adding input args for admin resolvers * chore: invited user renamed * chore: updated mailer service to be compatible with new mailer * chore: updated team service with review changes * chore: updated team collection service with review changes * chore: updated team environments service with review changes * chore: updated team requests service with review changes * chore: updated user service with review changes * refactor: invited user model * chore: review changes implemented * chore: implemented the review changes for admin, user and teams module * chore: removed error handling and implemented review changes * refactor: naming change for IsAdmin --------- Co-authored-by: Balu Babu <balub997@gmail.com> Co-authored-by: Andrew Bastin <andrewbastin.k@gmail.com>
This commit is contained in:
Ankit Sridhar
GitHub
@@ -24,6 +24,7 @@ import * as E from 'fp-ts/Either';
|
||||
const mockPrisma = mockDeep<PrismaService>();
|
||||
const mockPubSub = mockDeep<PubSubService>();
|
||||
|
||||
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
|
||||
// @ts-ignore
|
||||
const teamCollectionService = new TeamCollectionService(
|
||||
mockPrisma,
|
||||
@@ -1428,4 +1429,36 @@ describe('replaceCollectionsWithJSON', () => {
|
||||
});
|
||||
});
|
||||
|
||||
describe('totalCollectionsInTeam', () => {
|
||||
test('should resolve right and return a total team colls count ', async () => {
|
||||
mockPrisma.teamCollection.count.mockResolvedValueOnce(2);
|
||||
const result = await teamCollectionService.totalCollectionsInTeam('id1');
|
||||
expect(mockPrisma.teamCollection.count).toHaveBeenCalledWith({
|
||||
where: {
|
||||
teamID: 'id1',
|
||||
},
|
||||
});
|
||||
expect(result).toEqual(2);
|
||||
});
|
||||
test('should resolve left and return an error when no team colls found', async () => {
|
||||
mockPrisma.teamCollection.count.mockResolvedValueOnce(0);
|
||||
const result = await teamCollectionService.totalCollectionsInTeam('id1');
|
||||
expect(mockPrisma.teamCollection.count).toHaveBeenCalledWith({
|
||||
where: {
|
||||
teamID: 'id1',
|
||||
},
|
||||
});
|
||||
expect(result).toEqual(0);
|
||||
});
|
||||
|
||||
describe('getTeamCollectionsCount', () => {
|
||||
test('should return count of all Team Collections in the organization', async () => {
|
||||
mockPrisma.teamCollection.count.mockResolvedValueOnce(10);
|
||||
|
||||
const result = await teamCollectionService.getTeamCollectionsCount();
|
||||
expect(result).toEqual(10);
|
||||
});
|
||||
});
|
||||
});
|
||||
|
||||
//ToDo: write test cases for exportCollectionsToJSON
|
||||
|
||||
@@ -613,13 +613,6 @@ export class TeamCollectionService {
|
||||
},
|
||||
});
|
||||
|
||||
// // Update orderIndexes in TeamCollection table for user
|
||||
// await this.updateOrderIndex(
|
||||
// collection.parentID,
|
||||
// { gt: collection.orderIndex },
|
||||
// { decrement: 1 },
|
||||
// );
|
||||
|
||||
// Delete collection from TeamCollection table
|
||||
const deletedTeamCollection = await this.removeTeamCollection(
|
||||
collection.id,
|
||||
@@ -956,6 +949,31 @@ export class TeamCollectionService {
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Fetch list of all the Team Collections in DB for a particular team
|
||||
* @param teamID Team ID
|
||||
* @returns number of Team Collections in the DB
|
||||
*/
|
||||
async totalCollectionsInTeam(teamID: string) {
|
||||
const collCount = await this.prisma.teamCollection.count({
|
||||
where: {
|
||||
teamID: teamID,
|
||||
},
|
||||
});
|
||||
|
||||
return collCount;
|
||||
}
|
||||
|
||||
/**
|
||||
* Fetch list of all the Team Collections in DB
|
||||
*
|
||||
* @returns number of Team Collections in the DB
|
||||
*/
|
||||
async getTeamCollectionsCount() {
|
||||
const teamCollectionsCount = this.prisma.teamCollection.count();
|
||||
return teamCollectionsCount;
|
||||
}
|
||||
|
||||
// async importCollectionFromFirestore(
|
||||
// userUid: string,
|
||||
// fbCollectionPath: string,
|
||||
|
||||
Reference in New Issue
Block a user