refactor: remove method chaining for consistency

packages/hoppscotch-backend/src/admin/admin.service.spec.ts

@@ -121,7 +121,6 @@ describe('AdminService', () => {
           NOT: {
             inviteeEmail: {
               in: [dbAdminUsers[0].email],
-              mode: 'insensitive',
             },
           },
         },
@@ -230,10 +229,7 @@ describe('AdminService', () => {
 
       expect(mockPrisma.invitedUsers.deleteMany).toHaveBeenCalledWith({
         where: {
-          inviteeEmail: {
+          inviteeEmail: { in: [invitedUsers[0].inviteeEmail] },
-            in: [invitedUsers[0].inviteeEmail],
-            mode: 'insensitive',
-          },
         },
       });
       expect(result).toEqualRight(true);

packages/hoppscotch-backend/src/admin/admin.service.ts

@@ -89,17 +89,12 @@ export class AdminService {
     adminEmail: string,
     inviteeEmail: string,
   ) {
-    if (inviteeEmail.toLowerCase() == adminEmail.toLowerCase()) {
+    if (inviteeEmail == adminEmail) return E.left(DUPLICATE_EMAIL);
-      return E.left(DUPLICATE_EMAIL);
-    }
     if (!validateEmail(inviteeEmail)) return E.left(INVALID_EMAIL);
 
     const alreadyInvitedUser = await this.prisma.invitedUsers.findFirst({
       where: {
-        inviteeEmail: {
+        inviteeEmail: inviteeEmail,
-          equals: inviteeEmail,
-          mode: 'insensitive',
-        },
       },
     });
     if (alreadyInvitedUser != null) return E.left(USER_ALREADY_INVITED);
@@ -164,7 +159,7 @@ export class AdminService {
     try {
       await this.prisma.invitedUsers.deleteMany({
         where: {
-          inviteeEmail: { in: inviteeEmails, mode: 'insensitive' },
+          inviteeEmail: { in: inviteeEmails },
         },
       });
       return E.right(true);
@@ -194,7 +189,6 @@ export class AdminService {
         NOT: {
           inviteeEmail: {
             in: userEmailObjs.map((user) => user.email),
-            mode: 'insensitive',
           },
         },
       },

packages/hoppscotch-backend/src/shortcode/shortcode.service.ts

@@ -299,10 +299,7 @@ export class ShortcodeService implements UserDataHandler, OnModuleInit {
       where: userEmail
         ? {
             User: {
-              email: {
+              email: userEmail,
-                equals: userEmail,
-                mode: 'insensitive',
-              },
             },
           }
         : undefined,

packages/hoppscotch-backend/src/team-invitation/team-invitation.service.ts

@@ -75,13 +75,12 @@ export class TeamInvitationService {
     if (!isEmailValid) return E.left(INVALID_EMAIL);
 
     try {
-      const teamInvite = await this.prisma.teamInvitation.findFirstOrThrow({
+      const teamInvite = await this.prisma.teamInvitation.findUniqueOrThrow({
         where: {
-          inviteeEmail: {
+          teamID_inviteeEmail: {
-            equals: inviteeEmail,
+            inviteeEmail: inviteeEmail,
-            mode: 'insensitive',
+            teamID: teamID,
           },
-          teamID,
         },
       });
 

packages/hoppscotch-backend/src/user/user.service.spec.ts

@@ -149,7 +149,7 @@ beforeEach(() => {
 describe('UserService', () => {
   describe('findUserByEmail', () => {
     test('should successfully return a valid user given a valid email', async () => {
-      mockPrisma.user.findFirst.mockResolvedValueOnce(user);
+      mockPrisma.user.findUniqueOrThrow.mockResolvedValueOnce(user);
 
       const result = await userService.findUserByEmail(
         'dwight@dundermifflin.com',
@@ -158,7 +158,7 @@ describe('UserService', () => {
     });
 
     test('should return a null user given a invalid email', async () => {
-      mockPrisma.user.findFirst.mockResolvedValueOnce(null);
+      mockPrisma.user.findUniqueOrThrow.mockRejectedValueOnce('NotFoundError');
 
       const result = await userService.findUserByEmail('jim@dundermifflin.com');
       expect(result).resolves.toBeNone;

packages/hoppscotch-backend/src/user/user.service.ts

@@ -62,16 +62,16 @@ export class UserService {
    * @returns Option of found User
    */
   async findUserByEmail(email: string): Promise<O.None | O.Some<AuthUser>> {
-    const user = await this.prisma.user.findFirst({
+    try {
-      where: {
+      const user = await this.prisma.user.findUniqueOrThrow({
-        email: {
+        where: {
-          equals: email,
+          email: email,
-          mode: 'insensitive',
         },
-      },
+      });
-    });
+      return O.some(user);
-    if (!user) return O.none;
+    } catch (error) {
-    return O.some(user);
+      return O.none;
+    }
   }
 
   /**

packages/hoppscotch-common/src/services/persistence/validation-schemas/index.ts

@@ -400,7 +400,7 @@ const HoppTestResultSchema = z
                 (x) => "secret" in x && !x.secret
               ).and(
                 z.object({
-                  previousValue: z.string(),
+                  previousValue: z.optional(z.string()),
                 })
               )
             ),
@@ -415,7 +415,7 @@ const HoppTestResultSchema = z
                 (x) => "secret" in x && !x.secret
               ).and(
                 z.object({
-                  previousValue: z.string(),
+                  previousValue: z.optional(z.string()),
                 })
               )
             ),