From 0a28d478d81008b228182e7cfbe7669ce15a5b63 Mon Sep 17 00:00:00 2001 From: victorAnumudu Date: Wed, 15 May 2024 17:41:41 +0100 Subject: [PATCH] correct loan route added --- src/app/modules/process/core/_models.ts | 43 +++++++++ src/app/modules/process/core/_requests.ts | 87 +++++++++++++++++++ .../users-list/core/QueryResponseProvider.tsx | 6 +- .../users-list/table/UsersTable.tsx | 2 +- .../users-list/core/QueryResponseProvider.tsx | 6 +- .../users-list/table/UsersTable.tsx | 2 +- .../users-list/core/QueryResponseProvider.tsx | 6 +- .../users-list/table/UsersTable.tsx | 2 +- .../users-list/core/QueryResponseProvider.tsx | 6 +- .../users-list/table/UsersTable.tsx | 2 +- .../users-list/core/QueryResponseProvider.tsx | 4 +- .../users-list/table/UsersTable.tsx | 2 +- 12 files changed, 149 insertions(+), 19 deletions(-) create mode 100644 src/app/modules/process/core/_models.ts create mode 100644 src/app/modules/process/core/_requests.ts diff --git a/src/app/modules/process/core/_models.ts b/src/app/modules/process/core/_models.ts new file mode 100644 index 0000000..8b9a607 --- /dev/null +++ b/src/app/modules/process/core/_models.ts @@ -0,0 +1,43 @@ +import { ID, Response } from "../../../../_digifi/helpers" + +export type User = { + id?: ID + name?: string + avatar?: string + // email?: string + position?: string + role?: string + last_login?: string + two_steps?: boolean + joined_day?: string + online?: boolean + initials?: { + label: string + state: string + } + firstname?: string, + lastname?: string + uid?: string + loan_amount?: string + payment_month?: string + sales_agent?: string + gender?: string | null + marital_status?: string + email?: string + address?: string + state?: string + country?: string + status?: string + added?: string + updated?: string +} + +export type UsersQueryResponse = Response> + +export const initialUser: User = { + avatar: 'avatars/300-6.jpg', + position: 'Art Director', + role: 'Administrator', + name: '', + email: '', +} diff --git a/src/app/modules/process/core/_requests.ts b/src/app/modules/process/core/_requests.ts new file mode 100644 index 0000000..4ada44f --- /dev/null +++ b/src/app/modules/process/core/_requests.ts @@ -0,0 +1,87 @@ +import axios, { AxiosResponse } from "axios"; +import { ID, Response } from "../../../../_digifi/helpers" +import { User, UsersQueryResponse } from "./_models"; + +const API_URL = import.meta.env.VITE_APP_THEME_API_URL; +const USER_URL = `${API_URL}/user`; +// const GET_USERS_URL = `${API_URL}/users/query`; + +const NEW_USER_ENDPOINT = import.meta.env.VITE_APP_USER_ENDPOINT + +// const getStartedUsers = (query: string): Promise => { +// return axios +// .get(`${GET_USERS_URL}?${query}`) +// .then((d: AxiosResponse) => d.data); +// }; +const getStartedUsers = (query: string): Promise => { // FUNCTION TO GET USERS THAT HAVE STARTED LOAN APPLICATION + return axios + .get(`${NEW_USER_ENDPOINT}/loan/started`) + .then((d: AxiosResponse) => d.data); +}; + +const getRejectedUsers = (query: string): Promise => { // FUNCTION TO GET USERS THAT HAVE REJECTED LOAN APPLICATION + return axios + .get(`${NEW_USER_ENDPOINT}/loan/rejected`) + .then((d: AxiosResponse) => d.data); +}; + +const getPendingUsers = (query: string): Promise => { // FUNCTION TO GET USERS THAT HAVE PENDING LOAN APPLICATION + return axios + .get(`${NEW_USER_ENDPOINT}/loan/pending`) + .then((d: AxiosResponse) => d.data); +}; + +const getReadyUsers = (query: string): Promise => { // FUNCTION TO GET USERS THAT HAVE READY LOAN APPLICATION + return axios + .get(`${NEW_USER_ENDPOINT}/loan/ready`) + .then((d: AxiosResponse) => d.data); +}; + +const getApprovedUsers = (query: string): Promise => { // FUNCTION TO GET USERS THAT HAVE APPROVED LOAN APPLICATION + return axios + .get(`${NEW_USER_ENDPOINT}/loan/approved`) + .then((d: AxiosResponse) => d.data); +}; + +const getUserById = (id: ID): Promise => { + return axios + .get(`${USER_URL}/${id}`) + .then((response: AxiosResponse>) => response.data) + .then((response: Response) => response.data); +}; + +const createUser = (user: User): Promise => { + return axios + .put(USER_URL, user) + .then((response: AxiosResponse>) => response.data) + .then((response: Response) => response.data); +}; + +const updateUser = (user: User): Promise => { + return axios + .post(`${USER_URL}/${user.id}`, user) + .then((response: AxiosResponse>) => response.data) + .then((response: Response) => response.data); +}; + +const deleteUser = (userId: ID): Promise => { + return axios.delete(`${USER_URL}/${userId}`).then(() => {}); +}; + +const deleteSelectedUsers = (userIds: Array): Promise => { + const requests = userIds.map((id) => axios.delete(`${USER_URL}/${id}`)); + return axios.all(requests).then(() => {}); +}; + +export { + getStartedUsers, + getRejectedUsers, + getPendingUsers, + getReadyUsers, + getApprovedUsers, + deleteUser, + deleteSelectedUsers, + getUserById, + createUser, + updateUser, +}; diff --git a/src/app/modules/process/user-approved/users-list/core/QueryResponseProvider.tsx b/src/app/modules/process/user-approved/users-list/core/QueryResponseProvider.tsx index 3f7cffe..f451987 100644 --- a/src/app/modules/process/user-approved/users-list/core/QueryResponseProvider.tsx +++ b/src/app/modules/process/user-approved/users-list/core/QueryResponseProvider.tsx @@ -11,8 +11,8 @@ import { stringifyRequestQuery, WithChildren, } from '../../../../../../_digifi/helpers' -import {getStartedUsers} from './_requests' -import {User} from './_models' +import {getApprovedUsers} from '../../../core/_requests' +import {User} from '../../../core/_models' import {useQueryRequest} from './QueryRequestProvider' const QueryResponseContext = createResponseContext(initialQueryResponse) @@ -34,7 +34,7 @@ const QueryResponseProvider: FC = ({children}) => { } = useQuery( `${QUERIES.USERS_LIST}-${query}`, () => { - return getStartedUsers(query) + return getApprovedUsers(query) }, {cacheTime: 0, keepPreviousData: true, refetchOnWindowFocus: false} ) diff --git a/src/app/modules/process/user-approved/users-list/table/UsersTable.tsx b/src/app/modules/process/user-approved/users-list/table/UsersTable.tsx index f48b4b4..e803da9 100644 --- a/src/app/modules/process/user-approved/users-list/table/UsersTable.tsx +++ b/src/app/modules/process/user-approved/users-list/table/UsersTable.tsx @@ -4,7 +4,7 @@ import {CustomHeaderColumn} from './columns/CustomHeaderColumn' import {CustomRow} from './columns/CustomRow' import {useQueryResponseData, useQueryResponseLoading} from '../core/QueryResponseProvider' import {usersColumns} from './columns/_columns' -import {User} from '../core/_models' +import {User} from '../../../core/_models' import {UsersListLoading} from '../components/loading/UsersListLoading' import {UsersListPagination} from '../components/pagination/UsersListPagination' import {KTCardBody} from '../../../../../../_digifi/helpers' diff --git a/src/app/modules/process/user-pending/users-list/core/QueryResponseProvider.tsx b/src/app/modules/process/user-pending/users-list/core/QueryResponseProvider.tsx index 3f7cffe..b3520a2 100644 --- a/src/app/modules/process/user-pending/users-list/core/QueryResponseProvider.tsx +++ b/src/app/modules/process/user-pending/users-list/core/QueryResponseProvider.tsx @@ -11,8 +11,8 @@ import { stringifyRequestQuery, WithChildren, } from '../../../../../../_digifi/helpers' -import {getStartedUsers} from './_requests' -import {User} from './_models' +import {getPendingUsers} from '../../../core/_requests' +import {User} from '../../../core/_models' import {useQueryRequest} from './QueryRequestProvider' const QueryResponseContext = createResponseContext(initialQueryResponse) @@ -34,7 +34,7 @@ const QueryResponseProvider: FC = ({children}) => { } = useQuery( `${QUERIES.USERS_LIST}-${query}`, () => { - return getStartedUsers(query) + return getPendingUsers(query) }, {cacheTime: 0, keepPreviousData: true, refetchOnWindowFocus: false} ) diff --git a/src/app/modules/process/user-pending/users-list/table/UsersTable.tsx b/src/app/modules/process/user-pending/users-list/table/UsersTable.tsx index f48b4b4..e803da9 100644 --- a/src/app/modules/process/user-pending/users-list/table/UsersTable.tsx +++ b/src/app/modules/process/user-pending/users-list/table/UsersTable.tsx @@ -4,7 +4,7 @@ import {CustomHeaderColumn} from './columns/CustomHeaderColumn' import {CustomRow} from './columns/CustomRow' import {useQueryResponseData, useQueryResponseLoading} from '../core/QueryResponseProvider' import {usersColumns} from './columns/_columns' -import {User} from '../core/_models' +import {User} from '../../../core/_models' import {UsersListLoading} from '../components/loading/UsersListLoading' import {UsersListPagination} from '../components/pagination/UsersListPagination' import {KTCardBody} from '../../../../../../_digifi/helpers' diff --git a/src/app/modules/process/user-ready/users-list/core/QueryResponseProvider.tsx b/src/app/modules/process/user-ready/users-list/core/QueryResponseProvider.tsx index 3f7cffe..9f9e490 100644 --- a/src/app/modules/process/user-ready/users-list/core/QueryResponseProvider.tsx +++ b/src/app/modules/process/user-ready/users-list/core/QueryResponseProvider.tsx @@ -11,8 +11,8 @@ import { stringifyRequestQuery, WithChildren, } from '../../../../../../_digifi/helpers' -import {getStartedUsers} from './_requests' -import {User} from './_models' +import {getReadyUsers} from '../../../core/_requests' +import {User} from '../../../core/_models' import {useQueryRequest} from './QueryRequestProvider' const QueryResponseContext = createResponseContext(initialQueryResponse) @@ -34,7 +34,7 @@ const QueryResponseProvider: FC = ({children}) => { } = useQuery( `${QUERIES.USERS_LIST}-${query}`, () => { - return getStartedUsers(query) + return getReadyUsers(query) }, {cacheTime: 0, keepPreviousData: true, refetchOnWindowFocus: false} ) diff --git a/src/app/modules/process/user-ready/users-list/table/UsersTable.tsx b/src/app/modules/process/user-ready/users-list/table/UsersTable.tsx index f48b4b4..e803da9 100644 --- a/src/app/modules/process/user-ready/users-list/table/UsersTable.tsx +++ b/src/app/modules/process/user-ready/users-list/table/UsersTable.tsx @@ -4,7 +4,7 @@ import {CustomHeaderColumn} from './columns/CustomHeaderColumn' import {CustomRow} from './columns/CustomRow' import {useQueryResponseData, useQueryResponseLoading} from '../core/QueryResponseProvider' import {usersColumns} from './columns/_columns' -import {User} from '../core/_models' +import {User} from '../../../core/_models' import {UsersListLoading} from '../components/loading/UsersListLoading' import {UsersListPagination} from '../components/pagination/UsersListPagination' import {KTCardBody} from '../../../../../../_digifi/helpers' diff --git a/src/app/modules/process/user-rejected/users-list/core/QueryResponseProvider.tsx b/src/app/modules/process/user-rejected/users-list/core/QueryResponseProvider.tsx index 3f7cffe..11422e7 100644 --- a/src/app/modules/process/user-rejected/users-list/core/QueryResponseProvider.tsx +++ b/src/app/modules/process/user-rejected/users-list/core/QueryResponseProvider.tsx @@ -11,8 +11,8 @@ import { stringifyRequestQuery, WithChildren, } from '../../../../../../_digifi/helpers' -import {getStartedUsers} from './_requests' -import {User} from './_models' +import {getRejectedUsers} from '../../../core/_requests' +import {User} from '../../../core/_models' import {useQueryRequest} from './QueryRequestProvider' const QueryResponseContext = createResponseContext(initialQueryResponse) @@ -34,7 +34,7 @@ const QueryResponseProvider: FC = ({children}) => { } = useQuery( `${QUERIES.USERS_LIST}-${query}`, () => { - return getStartedUsers(query) + return getRejectedUsers(query) }, {cacheTime: 0, keepPreviousData: true, refetchOnWindowFocus: false} ) diff --git a/src/app/modules/process/user-rejected/users-list/table/UsersTable.tsx b/src/app/modules/process/user-rejected/users-list/table/UsersTable.tsx index f48b4b4..e803da9 100644 --- a/src/app/modules/process/user-rejected/users-list/table/UsersTable.tsx +++ b/src/app/modules/process/user-rejected/users-list/table/UsersTable.tsx @@ -4,7 +4,7 @@ import {CustomHeaderColumn} from './columns/CustomHeaderColumn' import {CustomRow} from './columns/CustomRow' import {useQueryResponseData, useQueryResponseLoading} from '../core/QueryResponseProvider' import {usersColumns} from './columns/_columns' -import {User} from '../core/_models' +import {User} from '../../../core/_models' import {UsersListLoading} from '../components/loading/UsersListLoading' import {UsersListPagination} from '../components/pagination/UsersListPagination' import {KTCardBody} from '../../../../../../_digifi/helpers' diff --git a/src/app/modules/process/user-started/users-list/core/QueryResponseProvider.tsx b/src/app/modules/process/user-started/users-list/core/QueryResponseProvider.tsx index 3f7cffe..6ed3089 100644 --- a/src/app/modules/process/user-started/users-list/core/QueryResponseProvider.tsx +++ b/src/app/modules/process/user-started/users-list/core/QueryResponseProvider.tsx @@ -11,8 +11,8 @@ import { stringifyRequestQuery, WithChildren, } from '../../../../../../_digifi/helpers' -import {getStartedUsers} from './_requests' -import {User} from './_models' +import {getStartedUsers} from '../../../core/_requests' +import {User} from '../../../core/_models' import {useQueryRequest} from './QueryRequestProvider' const QueryResponseContext = createResponseContext(initialQueryResponse) diff --git a/src/app/modules/process/user-started/users-list/table/UsersTable.tsx b/src/app/modules/process/user-started/users-list/table/UsersTable.tsx index f48b4b4..e803da9 100644 --- a/src/app/modules/process/user-started/users-list/table/UsersTable.tsx +++ b/src/app/modules/process/user-started/users-list/table/UsersTable.tsx @@ -4,7 +4,7 @@ import {CustomHeaderColumn} from './columns/CustomHeaderColumn' import {CustomRow} from './columns/CustomRow' import {useQueryResponseData, useQueryResponseLoading} from '../core/QueryResponseProvider' import {usersColumns} from './columns/_columns' -import {User} from '../core/_models' +import {User} from '../../../core/_models' import {UsersListLoading} from '../components/loading/UsersListLoading' import {UsersListPagination} from '../components/pagination/UsersListPagination' import {KTCardBody} from '../../../../../../_digifi/helpers' -- 2.34.1