Refactor user API routes and update components to use new structure (#…

…9638)

src/Utils/request/api.tsx

@@ -90,7 +90,13 @@ export interface LoginCredentials {
   password: string;
 }
 
-type HttpMethod = "GET" | "POST" | "PUT" | "PATCH" | "DELETE";
+export enum HttpMethod {
+  GET = "GET",
+  POST = "POST",
+  PUT = "PUT",
+  PATCH = "PATCH",
+  DELETE = "DELETE",
+}
 
 export const API = <TResponse = undefined, TBody = undefined>(
   route: `${HttpMethod} ${string}`,
@@ -923,26 +929,6 @@ const routes = {
     },
   },
 
-  // New user routes
-  user: {
-    list: {
-      path: "/api/v1/users/",
-      method: "GET",
-      TRes: Type<PaginatedResponse<UserBase>>(),
-    },
-    create: {
-      path: "/api/v1/users/",
-      method: "POST",
-      TRes: Type<UserBase>(),
-      TBody: Type<UserBase>(),
-    },
-    get: {
-      path: "/api/v1/users/{username}/",
-      method: "GET",
-      TRes: Type<UserBase>(),
-    },
-  },
-
   // OTP Routes
   otp: {
     sendOtp: {

src/components/Common/UserSelector.tsx

@@ -23,10 +23,10 @@ import { Avatar } from "@/components/Common/Avatar";
 
 import useDebouncedState from "@/hooks/useDebouncedState";
 
-import routes from "@/Utils/request/api";
 import query from "@/Utils/request/query";
 import { formatName } from "@/Utils/utils";
 import { UserBase } from "@/types/user/user";
+import UserApi from "@/types/user/userApi";
 
 interface Props {
   selected?: UserBase;
@@ -47,7 +47,7 @@ export default function UserSelector({
 
   const { data, isFetching } = useQuery({
     queryKey: ["users", search],
-    queryFn: query(routes.user.list, {
+    queryFn: query(UserApi.list, {
       queryParams: { search_text: search },
     }),
   });

src/components/Users/CreateUserForm.tsx

@@ -26,10 +26,10 @@ import {
 import { GENDER_TYPES } from "@/common/constants";
 
 import * as Notification from "@/Utils/Notifications";
-import routes from "@/Utils/request/api";
 import request from "@/Utils/request/request";
 import OrganizationSelector from "@/pages/Organization/components/OrganizationSelector";
 import { UserBase } from "@/types/user/user";
+import UserApi from "@/types/user/userApi";
 
 const userFormSchema = z
   .object({
@@ -122,7 +122,7 @@ export default function CreateUserForm({ onSubmitSuccess }: Props) {
         res,
         data: user,
         error,
-      } = await request(routes.user.create, {
+      } = await request(UserApi.create, {
         body: {
           ...data,
           // Omit c_password as it's not needed in the API

src/pages/FacilityOrganization/components/LinkFacilityUserSheet.tsx

@@ -29,6 +29,7 @@ import mutate from "@/Utils/request/mutate";
 import query from "@/Utils/request/query";
 import { formatName } from "@/Utils/utils";
 import { UserBase } from "@/types/user/user";
+import UserApi from "@/types/user/userApi";
 
 interface Props {
   organizationId: string;
@@ -51,7 +52,7 @@ export default function LinkFacilityUserSheet({
 
   const { data: preSelectedUser } = useQuery({
     queryKey: ["user", preSelectedUsername],
-    queryFn: query(routes.user.get, {
+    queryFn: query(UserApi.get, {
       pathParams: { username: preSelectedUsername || "" },
     }),
     enabled: !!preSelectedUsername,

src/pages/Organization/components/LinkUserSheet.tsx

@@ -28,6 +28,7 @@ import routes from "@/Utils/request/api";
 import mutate from "@/Utils/request/mutate";
 import query from "@/Utils/request/query";
 import { UserBase } from "@/types/user/user";
+import UserApi from "@/types/user/userApi";
 
 interface Props {
   organizationId: string;
@@ -48,7 +49,7 @@ export default function LinkUserSheet({
 
   const { data: preSelectedUser } = useQuery({
     queryKey: ["user", preSelectedUsername],
-    queryFn: query(routes.user.get, {
+    queryFn: query(UserApi.get, {
       pathParams: { username: preSelectedUsername || "" },
     }),
     enabled: !!preSelectedUsername,

src/types/user/userApi.ts

@@ -0,0 +1,24 @@
+import { HttpMethod, Type } from "@/Utils/request/api";
+import { PaginatedResponse } from "@/Utils/request/types";
+
+import { UserBase } from "./user";
+
+export default {
+  list: {
+    path: "/api/v1/users/",
+    method: HttpMethod.GET,
+    TRes: Type<PaginatedResponse<UserBase>>(),
+  },
+  create: {
+    path: "/api/v1/users/",
+    method: HttpMethod.POST,
+    TRes: Type<UserBase>(),
+    TBody: Type<UserBase>(),
+  },
+  get: {
+    path: "/api/v1/users/{username}/",
+    method: HttpMethod.GET,
+
+    TRes: Type<UserBase>(),
+  },
+};