fix: invalid url error while fetching advertisements (PalisadoesFound…

…ation#2226) * fix: invalid url error while fetching advertisements * fix: failing tests * fix: failing tests * fix: formatting issues * improved code coverage
palisadoes · Apr 27, 2024 · a7fa6e3 · a7fa6e3
1 parent 0730681
commit a7fa6e3
Show file tree

Hide file tree

Showing 7 changed files with 70 additions and 10 deletions.
diff --git a/schema.graphql b/schema.graphql
@@ -89,7 +89,7 @@ enum AdvertisementType {
 
 type AdvertisementsConnection {
   edges: [AdvertisementEdge]
-  pageInfo: ConnectionPageInfo
+  pageInfo: DefaultConnectionPageInfo!
   totalCount: Int
 }
 
@@ -635,7 +635,6 @@ type Event {
   recurring: Boolean!
   startDate: Date!
   startTime: Time
-  status: Status!
   title: String!
   updatedAt: DateTime!
 }

diff --git a/src/resolvers/Mutation/updateAdvertisement.ts b/src/resolvers/Mutation/updateAdvertisement.ts
@@ -152,15 +152,16 @@ export const updateAdvertisement: MutationResolvers["updateAdvertisement"] =
       }
     }
 
+    const fieldsToUpdate = args.input.mediaFile
+      ? { ...args.input, mediaUrl: uploadMediaFile }
+      : { ...args.input };
+
     const updatedAdvertisement = await Advertisement.findOneAndUpdate(
       {
         _id: _id,
       },
       {
-        $set: {
-          ...args.input,
-          mediaUrl: uploadMediaFile,
-        },
+        $set: fieldsToUpdate,
       },
       {
         new: true,

diff --git a/src/resolvers/Organization/advertisements.ts b/src/resolvers/Organization/advertisements.ts
@@ -24,6 +24,7 @@ import { MAXIMUM_FETCH_LIMIT } from "../../constants";
 export const advertisements: OrganizationResolvers["advertisements"] = async (
   parent,
   args,
+  context,
 ) => {
   const parseGraphQLConnectionArgumentsResult =
     await parseGraphQLConnectionArguments({
@@ -73,12 +74,19 @@ export const advertisements: OrganizationResolvers["advertisements"] = async (
       .exec(),
   ]);
 
+  const advertisements = objectList.map(
+    (advertisement: InterfaceAdvertisement) => ({
+      ...advertisement,
+      mediaUrl: `${context.apiRootUrl}${advertisement.mediaUrl}`,
+    }),
+  );
+
   return transformToDefaultGraphQLConnection<
     ParsedCursor,
     InterfaceAdvertisement,
     InterfaceAdvertisement
   >({
-    objectList,
+    objectList: advertisements,
     parsedArgs,
     totalCount,
   });

diff --git a/src/typeDefs/types.ts b/src/typeDefs/types.ts
@@ -227,7 +227,7 @@ export const types = gql`
 
   type AdvertisementsConnection {
     edges: [AdvertisementEdge]
-    pageInfo: ConnectionPageInfo
+    pageInfo: DefaultConnectionPageInfo!
     totalCount: Int
   }
 

diff --git a/src/types/generatedGraphQLTypes.ts b/src/types/generatedGraphQLTypes.ts
@@ -159,7 +159,7 @@ export type AdvertisementType =
 export type AdvertisementsConnection = {
   __typename?: 'AdvertisementsConnection';
   edges?: Maybe<Array<Maybe<AdvertisementEdge>>>;
-  pageInfo?: Maybe<ConnectionPageInfo>;
+  pageInfo: DefaultConnectionPageInfo;
   totalCount?: Maybe<Scalars['Int']['output']>;
 };
 
@@ -3639,7 +3639,7 @@ export type AdvertisementEdgeResolvers<ContextType = any, ParentType extends Res
 
 export type AdvertisementsConnectionResolvers<ContextType = any, ParentType extends ResolversParentTypes['AdvertisementsConnection'] = ResolversParentTypes['AdvertisementsConnection']> = {
   edges?: Resolver<Maybe<Array<Maybe<ResolversTypes['AdvertisementEdge']>>>, ParentType, ContextType>;
-  pageInfo?: Resolver<Maybe<ResolversTypes['ConnectionPageInfo']>, ParentType, ContextType>;
+  pageInfo?: Resolver<ResolversTypes['DefaultConnectionPageInfo'], ParentType, ContextType>;
   totalCount?: Resolver<Maybe<ResolversTypes['Int']>, ParentType, ContextType>;
   __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
 };

diff --git a/tests/resolvers/Mutation/updateAdvertisement.spec.ts b/tests/resolvers/Mutation/updateAdvertisement.spec.ts
@@ -351,6 +351,55 @@ describe("resolvers -> Mutation -> updateAdvertisement", () => {
     expect(advertisement).toEqual({ advertisement: expectedAdvertisement });
   });
 
+  it(`updates the advertisement without media and returns it`, async () => {
+    const { requestContext } = await import("../../../src/libraries");
+
+    vi.spyOn(requestContext, "translate").mockImplementationOnce(
+      (message: string) => `Translated ${message}`,
+    );
+
+    const args: MutationUpdateAdvertisementArgs = {
+      input: {
+        _id: testAdvertisement._id,
+        name: "New Advertisement Name",
+        type: "POPUP",
+      },
+    };
+
+    const context = { userId: testSuperAdmin?.id };
+
+    const updateAdvertisementPayload = await updateAdvertisementResolver?.(
+      {},
+      args,
+      context,
+    );
+    const advertisement = updateAdvertisementPayload || {};
+
+    const updatedTestAdvertisement = await Advertisement.findOne({
+      _id: testAdvertisement._id,
+    }).lean();
+
+    let expectedAdvertisement;
+
+    if (!updatedTestAdvertisement) {
+      console.error("Updated advertisement not found in the database");
+    } else {
+      expectedAdvertisement = {
+        _id: updatedTestAdvertisement._id.toString(), // Ensure _id is converted to String as per GraphQL schema
+        name: updatedTestAdvertisement.name,
+        organizationId: updatedTestAdvertisement.organizationId,
+        mediaUrl: updatedTestAdvertisement.mediaUrl,
+        type: updatedTestAdvertisement.type,
+        startDate: updatedTestAdvertisement.startDate,
+        endDate: updatedTestAdvertisement.endDate,
+        createdAt: updatedTestAdvertisement.createdAt,
+        updatedAt: updatedTestAdvertisement.updatedAt,
+        creatorId: updatedTestAdvertisement.creatorId,
+      };
+    }
+    expect(advertisement).toEqual({ advertisement: expectedAdvertisement });
+  });
+
   it(`updates the advertisement media with unsupported file type`, async () => {
     const { requestContext } = await import("../../../src/libraries");
 

diff --git a/tests/resolvers/Organization/advertisements.spec.ts b/tests/resolvers/Organization/advertisements.spec.ts
@@ -86,6 +86,7 @@ describe("resolvers -> Organization -> Advertisement", () => {
       },
       {},
     );
+    const context = { apiRootUrl: undefined };
 
     expect(connection).toEqual({
       edges: [
@@ -94,13 +95,15 @@ describe("resolvers -> Organization -> Advertisement", () => {
           node: {
             ...testAdvertisement2,
             _id: testAdvertisement2?._id.toString(),
+            mediaUrl: `${context.apiRootUrl}${testAdvertisement2.mediaUrl}`,
           },
         },
         {
           cursor: testAdvertisement1?._id.toString(),
           node: {
             ...testAdvertisement1,
             _id: testAdvertisement1?._id.toString(),
+            mediaUrl: `${context.apiRootUrl}${testAdvertisement1.mediaUrl}`,
           },
         },
       ],