Peter Makowski has proposed merging
~petermakowski/maas-site-manager:MAASENG-1676-requests-endpoint-POST-method
into maas-site-manager:main.
Commit message:
use POST method for requests MAASENG-1676
Requested reviews:
MAAS Committers (maas-committers)
For more details, see:
https://code.launchpad.net/~petermakowski/maas-site-manager/+git/site-manager/+merge/442721
--
Your team MAAS Committers is requested to review the proposed merge of
~petermakowski/maas-site-manager:MAASENG-1676-requests-endpoint-POST-method
into maas-site-manager:main.
diff --git a/frontend/src/api/handlers.test.ts b/frontend/src/api/handlers.test.ts
index c03cbc3..6215bbe 100644
--- a/frontend/src/api/handlers.test.ts
+++ b/frontend/src/api/handlers.test.ts
@@ -1,11 +1,11 @@
import { setupServer } from "msw/node";
-import { patchEnrollmentRequests, postTokens } from "./handlers";
+import { postEnrollmentRequests, postTokens } from "./handlers";
import { durationFactory } from "@/mocks/factories";
import {
postTokens as postTokensResolver,
- patchEnrollmentRequests as postEnrollmentRequestsResolver,
+ postEnrollmentRequests as postEnrollmentRequestsResolver,
} from "@/mocks/resolvers";
const mockServer = setupServer(postTokensResolver, postEnrollmentRequestsResolver);
@@ -35,8 +35,8 @@ describe("postTokens handler", () => {
describe("postEnrollmentRequests handler", () => {
it("requires ids and accept values", async () => {
// @ts-expect-error
- await expect(patchEnrollmentRequests({})).rejects.toThrowError();
- await expect(patchEnrollmentRequests({ ids: [], accept: false })).resolves.toEqual("");
- await expect(patchEnrollmentRequests({ ids: [], accept: true })).resolves.toEqual("");
+ await expect(postEnrollmentRequests({})).rejects.toThrowError();
+ await expect(postEnrollmentRequests({ ids: [], accept: false })).resolves.toEqual("");
+ await expect(postEnrollmentRequests({ ids: [], accept: true })).resolves.toEqual("");
});
});
diff --git a/frontend/src/api/handlers.ts b/frontend/src/api/handlers.ts
index 70d4775..8f23c6b 100644
--- a/frontend/src/api/handlers.ts
+++ b/frontend/src/api/handlers.ts
@@ -100,12 +100,12 @@ export type PostEnrollmentRequestsData = {
ids: string[];
accept: boolean;
};
-export const patchEnrollmentRequests = async (data: PostEnrollmentRequestsData) => {
+export const postEnrollmentRequests = async (data: PostEnrollmentRequestsData) => {
if (!data?.ids || typeof data?.accept !== "boolean") {
throw Error("Missing required fields");
}
try {
- const response = await api.patch(urls.enrollmentRequests, data);
+ const response = await api.post(urls.enrollmentRequests, data);
return response.data;
} catch (error) {
throw error;
diff --git a/frontend/src/components/RequestsList/RequestsList.test.tsx b/frontend/src/components/RequestsList/RequestsList.test.tsx
index 25b150d..9bd6364 100644
--- a/frontend/src/components/RequestsList/RequestsList.test.tsx
+++ b/frontend/src/components/RequestsList/RequestsList.test.tsx
@@ -5,7 +5,7 @@ import RequestsList from "./RequestsList";
import urls from "@/api/urls";
import { enrollmentRequestFactory } from "@/mocks/factories";
-import { createMockGetEnrollmentRequestsResolver, patchEnrollmentRequests } from "@/mocks/resolvers";
+import { createMockGetEnrollmentRequestsResolver, postEnrollmentRequests } from "@/mocks/resolvers";
import { renderWithMemoryRouter, screen, userEvent, waitFor } from "@/test-utils";
const enrollmentRequest = enrollmentRequestFactory.build({ name: "new-maas-site" });
@@ -13,7 +13,7 @@ const enrollmentRequests = [enrollmentRequest, ...enrollmentRequestFactory.build
const mockServer = setupServer(
rest.get(urls.enrollmentRequests, createMockGetEnrollmentRequestsResolver(enrollmentRequests)),
- patchEnrollmentRequests,
+ postEnrollmentRequests,
);
beforeAll(() => {
diff --git a/frontend/src/hooks/react-query.ts b/frontend/src/hooks/react-query.ts
index 8636f61..3128959 100644
--- a/frontend/src/hooks/react-query.ts
+++ b/frontend/src/hooks/react-query.ts
@@ -12,7 +12,7 @@ import type {
import {
deleteTokens,
postLogin,
- patchEnrollmentRequests,
+ postEnrollmentRequests,
getEnrollmentRequests,
postTokens,
getSites,
@@ -104,7 +104,7 @@ export const useEnrollmentRequestsMutation = (
options: UseMutationOptions<unknown, unknown, PostEnrollmentRequestsData, unknown>,
) => {
const queryClient = useQueryClient();
- return useMutation(patchEnrollmentRequests, {
+ return useMutation(postEnrollmentRequests, {
onSuccess: (...args) => {
queryClient.invalidateQueries({ queryKey: ["requests"] });
options?.onSuccess?.(...args);
diff --git a/frontend/src/mocks/browser.ts b/frontend/src/mocks/browser.ts
index ab41f1f..953140f 100644
--- a/frontend/src/mocks/browser.ts
+++ b/frontend/src/mocks/browser.ts
@@ -5,7 +5,7 @@ import {
getSites,
getTokens,
getEnrollmentRequests,
- patchEnrollmentRequests,
+ postEnrollmentRequests,
postTokens,
deleteTokens,
} from "./resolvers";
@@ -15,7 +15,7 @@ export const worker = setupWorker(
getSites,
postTokens,
getEnrollmentRequests,
- patchEnrollmentRequests,
+ postEnrollmentRequests,
getTokens,
deleteTokens,
);
diff --git a/frontend/src/mocks/resolvers.ts b/frontend/src/mocks/resolvers.ts
index 6816311..131e669 100644
--- a/frontend/src/mocks/resolvers.ts
+++ b/frontend/src/mocks/resolvers.ts
@@ -122,5 +122,5 @@ export const postTokens = rest.post(urls.tokens, createMockTokensResolver());
export const getTokens = rest.get(urls.tokens, createMockGetTokensResolver());
export const deleteTokens = rest.delete(urls.tokens, createMockDeleteTokensResolver());
export const getEnrollmentRequests = rest.get(urls.enrollmentRequests, createMockGetEnrollmentRequestsResolver());
-export const patchEnrollmentRequests = rest.patch(urls.enrollmentRequests, createMockPostEnrollmentRequestsResolver());
-export const allResolvers = [getSites, postTokens, getTokens, getEnrollmentRequests, patchEnrollmentRequests];
+export const postEnrollmentRequests = rest.post(urls.enrollmentRequests, createMockPostEnrollmentRequestsResolver());
+export const allResolvers = [getSites, postTokens, getTokens, getEnrollmentRequests, postEnrollmentRequests];
--
Mailing list: https://launchpad.net/~sts-sponsors
Post to : sts-sponsors@lists.launchpad.net
Unsubscribe : https://launchpad.net/~sts-sponsors
More help : https://help.launchpad.net/ListHelp
