chore: resolved all comments raised in review

packages/hoppscotch-backend/prisma/schema.prisma

@@ -67,19 +67,10 @@ model TeamRequest {
   updatedOn    DateTime       @updatedAt @db.Timestamp(3)
 }
 
-// model Shortcode {
-//   id         String   @id
-//   request    Json
-//   creatorUid String?
-//   createdOn  DateTime @default(now())
-
-//   @@unique(fields: [id, creatorUid], name: "creator_uid_shortcode_unique")
-// }
-
 model Shortcode {
   id         String   @id @unique
   request    Json
-  properties Json? // if properties is null, SharedRequest is an embed else shortcode
+  properties Json? // if properties is null, SharedRequest is an shortcode else embed
   creatorUid String?
   User       User?    @relation(fields: [creatorUid], references: [uid])
   createdOn  DateTime @default(now())

packages/hoppscotch-backend/src/gql-schema.ts

@@ -27,7 +27,7 @@ import { UserRequestUserCollectionResolver } from './user-request/resolvers/user
 import { UserEnvsUserResolver } from './user-environment/user.resolver';
 import { UserHistoryUserResolver } from './user-history/user.resolver';
 import { UserSettingsUserResolver } from './user-settings/user.resolver';
-import { SharedRequestModule } from './shared-request/shared-request.module';
+import { SharedRequestResolver } from './shared-request/shared-request.resolver';
 
 /**
  * All the resolvers present in the application.
@@ -57,7 +57,7 @@ const RESOLVERS = [
   UserRequestUserCollectionResolver,
   UserSettingsResolver,
   UserSettingsUserResolver,
-  SharedRequestModule,
+  SharedRequestResolver,
 ];
 
 /**

packages/hoppscotch-backend/src/shared-request/shared-request.resolver.ts

@@ -49,7 +49,7 @@ export class SharedRequestResolver {
     description: 'List all shared-request the current user has generated',
   })
   @UseGuards(GqlAuthGuard)
-  async mySharedRequest(
+  async mySharedRequests(
     @GqlUser() user: AuthUser,
     @Args() args: PaginationArgs,
   ) {

packages/hoppscotch-backend/src/shared-request/shared-request.service.spec.ts

@@ -4,9 +4,6 @@ import {
   SHARED_REQUEST_INVALID_PROPERTIES_JSON,
   SHARED_REQUEST_INVALID_REQUEST_JSON,
   SHARED_REQUEST_NOT_FOUND,
-  SHORTCODE_ALREADY_EXISTS,
-  SHORTCODE_INVALID_JSON,
-  SHORTCODE_NOT_FOUND,
 } from 'src/errors';
 import { UserService } from 'src/user/user.service';
 import { SharedRequestService } from './shared-request.service';
@@ -169,7 +166,7 @@ describe('SharedRequestService', () => {
         id: mockShortcode.id,
         createdOn: mockShortcode.createdOn,
         request: JSON.stringify(mockShortcode.request),
-        properties: JSON.stringify(mockShortcode.properties),
+        properties: mockShortcode.properties,
       });
     });
 
@@ -192,7 +189,7 @@ describe('SharedRequestService', () => {
           id: mockShortcode.id,
           createdOn: mockShortcode.createdOn,
           request: JSON.stringify(mockShortcode.request),
-          properties: JSON.stringify(mockShortcode.properties),
+          properties: mockShortcode.properties,
         },
       );
     });

packages/hoppscotch-backend/src/shared-request/shared-request.service.ts

@@ -67,7 +67,10 @@ export class SharedRequestService implements UserDataHandler, OnModuleInit {
     return <SharedRequest>{
       id: sharedRequestInfo.id,
       request: JSON.stringify(sharedRequestInfo.request),
-      properties: JSON.stringify(sharedRequestInfo.properties),
+      properties:
+        sharedRequestInfo.properties != null
+          ? JSON.stringify(sharedRequestInfo.properties)
+          : null,
       createdOn: sharedRequestInfo.createdOn,
     };
   }
@@ -125,19 +128,23 @@ export class SharedRequestService implements UserDataHandler, OnModuleInit {
    */
   async createSharedRequest(
     request: string,
-    properties: string | null,
+    properties: string | null = null,
     userInfo: AuthUser,
   ) {
     const requestData = stringToJson(request);
     if (E.isLeft(requestData))
       return E.left(SHARED_REQUEST_INVALID_REQUEST_JSON);
 
-    let propertiesData;
+    // let propertiesData;
-    if (!properties) propertiesData = undefined;
+    // if (!properties) propertiesData = undefined;
+    // const parsedProperties = stringToJson(properties);
+    // if (E.isLeft(parsedProperties))
+    //   return E.left(SHARED_REQUEST_INVALID_PROPERTIES_JSON);
+    // propertiesData = parsedProperties.right;
+
     const parsedProperties = stringToJson(properties);
     if (E.isLeft(parsedProperties))
       return E.left(SHARED_REQUEST_INVALID_PROPERTIES_JSON);
-    propertiesData = parsedProperties.right;
 
     const generatedShortCode = await this.generateUniqueShortCodeID();
     if (E.isLeft(generatedShortCode)) return E.left(generatedShortCode.left);
@@ -146,7 +153,7 @@ export class SharedRequestService implements UserDataHandler, OnModuleInit {
       data: {
         id: generatedShortCode.right,
         request: requestData.right,
-        properties: propertiesData != null ? propertiesData : undefined,
+        properties: parsedProperties.right ?? undefined,
         creatorUid: userInfo.uid,
       },
     });

packages/hoppscotch-backend/src/shared-request/shared-requests.model.ts

@@ -19,7 +19,7 @@ export class SharedRequest {
   properties: string;
 
   @Field({
-    description: 'Timestamp of when the Shortcode was created',
+    description: 'Timestamp of when the SharedRequest was created',
   })
   createdOn: Date;
 }