From f846580afdd180c237138b315dd021fc5d841bbb Mon Sep 17 00:00:00 2001 From: Josepablo C Date: Sun, 10 Mar 2024 21:44:28 -0600 Subject: [PATCH] fix(users/company): Update user and companies endpoint to v1 --- src/composables/useCompanyProfile.js | 2 +- src/services/company.js | 14 +++++++------- src/services/public.js | 2 +- src/stores/company.js | 8 ++++---- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/composables/useCompanyProfile.js b/src/composables/useCompanyProfile.js index e364e7c..9ab6957 100644 --- a/src/composables/useCompanyProfile.js +++ b/src/composables/useCompanyProfile.js @@ -17,7 +17,7 @@ export default function useCompany() { loading.value = true; const companyId = auth.user.company; console.log(companyId) - const resp = await getCompany(companyId); + const resp = await getCompany(); companyStore.company = resp; company.value = resp; loading.value = false; diff --git a/src/services/company.js b/src/services/company.js index cdd15cf..36d86da 100644 --- a/src/services/company.js +++ b/src/services/company.js @@ -1,9 +1,9 @@ import api from "../lib/axios"; -export const getCompany = async(companyId) => { +export const getCompany = async() => { try { - const endpoint = `/companies/${companyId}`; + const endpoint = `/v1/companies/own`; const {data} = await api.get(endpoint); return data; } catch (error) { @@ -12,9 +12,9 @@ export const getCompany = async(companyId) => { } } -export const updateCompany = async(companyId, formData) => { +export const updateCompany = async(formData) => { try { - const endpoint = `/companies/${companyId}`; + const endpoint = `/v1/companies/own`; const {data} = await api.patch(endpoint, formData); return data; } catch (error) { @@ -25,7 +25,7 @@ export const updateCompany = async(companyId, formData) => { export const getUsers = async(filter) => { try { - const endpoint = `/users?${filter}`; + const endpoint = `/v1/users/find?${filter}`; const {data} = await api.get(endpoint); return data; } catch (error) { @@ -47,7 +47,7 @@ export const createUser = async(formData) => { export const updateUser = async(user_id, formData) => { try { - const endpoint = `/users/${user_id}`; + const endpoint = `/v1/users/member/${user_id}`; const {data} = await api.patch(endpoint, formData); return data; } catch (error) { @@ -58,7 +58,7 @@ export const updateUser = async(user_id, formData) => { export const deleteUser = async(user_id) => { try { - const endpoint = `/users/${user_id}`; + const endpoint = `/v1/users/member/${user_id}`; const {data} = await api.delete(endpoint); return data; } catch (error) { diff --git a/src/services/public.js b/src/services/public.js index 40a7d45..3cf4ca2 100644 --- a/src/services/public.js +++ b/src/services/public.js @@ -63,7 +63,7 @@ export const getCompanies = async(filter) => { export const getUsersCompany = async(filter) => { try { - const endpoint = `/v1/users?${filter}`; + const endpoint = `/v1/users/find?${filter}`; // console.log({endpoint}); const {data} = await api.get(endpoint); return data; diff --git a/src/stores/company.js b/src/stores/company.js index 86a9e2b..81ba2bb 100644 --- a/src/stores/company.js +++ b/src/stores/company.js @@ -29,7 +29,7 @@ export const useCompanyStore = defineStore('company', () => { loading.value = true; if(!company.value) { loading.value = true; - const resp = await getCompany(companyId); + const resp = await getCompany(); company.value = resp; } loading.value = false; @@ -38,7 +38,7 @@ export const useCompanyStore = defineStore('company', () => { const getUsersCompany = async(limit = 10, skip = 0, reload = false) => { const companyId = localStorage.getItem('id'); if(users.value.length <= 0 || reload === true) { - const filter = `company=${companyId}&$sort%5BcreatedAt%5D=-1&$limit=${limit}&$skip=${skip}` + const filter = `company=${companyId}`; const resp = await getUsers(filter); if(resp !== null && resp.total > 0) { usersTotal.value = resp.total; @@ -52,7 +52,7 @@ export const useCompanyStore = defineStore('company', () => { const getDrivers = async() => { const companyId = localStorage.getItem('id'); if(drivers.value.length <= 0) { - const filter = `company=${companyId}&$sort%5BcreatedAt%5D=-1&$limit=100&$skip=0&job_role=driver` + const filter = `company=${companyId}&elements=100&job_role=driver`; const resp = await getUsers(filter); if(resp !== null && resp.total > 0) { drivers.value = resp.data; @@ -124,7 +124,7 @@ export const useCompanyStore = defineStore('company', () => { } const editCompany = async(formData) => { - const data = await updateCompany(company.value._id, formData); + const data = await updateCompany(formData); if(data === null) { return 'Algo salio mal, intente más tarde'; } else {