From ce27594f3949d2027465791f0539c133fcd68025 Mon Sep 17 00:00:00 2001 From: Britt Date: Wed, 20 Sep 2023 08:32:50 -0600 Subject: [PATCH] replace 404 with 200 response when empty banner is retrieved (#11467) --- services/app-api/handlers/banners/fetch.test.ts | 8 ++++---- services/app-api/handlers/banners/fetch.ts | 5 +---- .../ui-src/src/components/banners/AdminBannerProvider.tsx | 5 +---- 3 files changed, 6 insertions(+), 12 deletions(-) diff --git a/services/app-api/handlers/banners/fetch.test.ts b/services/app-api/handlers/banners/fetch.test.ts index 71ef48ccc..81d8ab657 100644 --- a/services/app-api/handlers/banners/fetch.test.ts +++ b/services/app-api/handlers/banners/fetch.test.ts @@ -27,10 +27,10 @@ const testEvent: APIGatewayProxyEvent = { }; describe("Test fetchBanner API method", () => { - test("Test Report not found Fetch", async () => { + test("Test Successful empty Banner Fetch", async () => { mockDocumentClient.get.promise.mockReturnValueOnce({ Item: undefined }); const res = await fetchBanner(testEvent, null); - expect(res.statusCode).toBe(StatusCodes.NOT_FOUND); + expect(res.statusCode).toBe(StatusCodes.SUCCESS); }); test("Test Successful Banner Fetch", async () => { @@ -51,7 +51,7 @@ describe("Test fetchBanner API method", () => { }; const res = await fetchBanner(noKeyEvent, null); - expect(res.statusCode).toBe(500); + expect(res.statusCode).toBe(StatusCodes.SERVER_ERROR); expect(res.body).toContain(error.NO_KEY); }); @@ -62,7 +62,7 @@ describe("Test fetchBanner API method", () => { }; const res = await fetchBanner(noKeyEvent, null); - expect(res.statusCode).toBe(500); + expect(res.statusCode).toBe(StatusCodes.SERVER_ERROR); expect(res.body).toContain(error.NO_KEY); }); }); diff --git a/services/app-api/handlers/banners/fetch.ts b/services/app-api/handlers/banners/fetch.ts index 445b6b6cf..3afb8e01d 100644 --- a/services/app-api/handlers/banners/fetch.ts +++ b/services/app-api/handlers/banners/fetch.ts @@ -17,9 +17,6 @@ export const fetchBanner = handler(async (event, _context) => { }; const response = await dynamoDb.get(params); - let status = StatusCodes.SUCCESS; - if (!response?.Item) { - status = StatusCodes.NOT_FOUND; - } + const status = StatusCodes.SUCCESS; return { status: status, body: response }; }); diff --git a/services/ui-src/src/components/banners/AdminBannerProvider.tsx b/services/ui-src/src/components/banners/AdminBannerProvider.tsx index b1620fe56..2426ae0f4 100644 --- a/services/ui-src/src/components/banners/AdminBannerProvider.tsx +++ b/services/ui-src/src/components/banners/AdminBannerProvider.tsx @@ -32,10 +32,7 @@ export const AdminBannerProvider = ({ children }: Props) => { setBannerData(newBannerData); } catch (e: any) { setIsLoading(false); - // 404 expected when no current banner exists - if (!e.toString().includes("404")) { - setError(bannerErrors.GET_BANNER_FAILED); - } + setError(bannerErrors.GET_BANNER_FAILED); } setIsLoading(false); };