diff --git a/app/apis/admin/create-category.ts b/app/apis/admin/create-category.ts index a98e922..a8fe97a 100644 --- a/app/apis/admin/create-category.ts +++ b/app/apis/admin/create-category.ts @@ -15,9 +15,9 @@ type TParameters = { } export const createCategoryRequest = async (parameters: TParameters) => { - const { accessToken, payload } = parameters + const { payload, ...restParameters } = parameters try { - const { data } = await HttpServer({ accessToken }).post( + const { data } = await HttpServer(restParameters).post( '/api/category/create', payload, ) diff --git a/app/apis/admin/create-news.ts b/app/apis/admin/create-news.ts index f3ac04f..d7e17e1 100644 --- a/app/apis/admin/create-news.ts +++ b/app/apis/admin/create-news.ts @@ -15,16 +15,16 @@ type TParameter = { } export const createNewsRequest = async (parameters: TParameter) => { - const { accessToken, payload } = parameters + const { payload, ...restParameters } = parameters + const { categories, tags, live_at, ...restPayload } = payload + const transformedPayload = { + ...restPayload, + categories: categories.map((category) => category?.id), + tags: tags?.map((tag) => tag?.id) || [], + live_at: new Date(live_at).toISOString(), + } try { - const { categories, tags, ...restPayload } = payload - const transformedPayload = { - ...restPayload, - categories: categories.map((category) => category?.id), - tags: tags?.map((tag) => tag?.id) || [], - live_at: new Date(payload?.live_at).toISOString(), - } - const { data } = await HttpServer({ accessToken }).post( + const { data } = await HttpServer(restParameters).post( '/api/news/create', transformedPayload, ) diff --git a/app/apis/admin/create-tags.ts b/app/apis/admin/create-tags.ts index 2922887..a5183f8 100644 --- a/app/apis/admin/create-tags.ts +++ b/app/apis/admin/create-tags.ts @@ -15,16 +15,11 @@ type TParameters = { } export const createTagsRequest = async (parameters: TParameters) => { - const { accessToken, payload } = parameters + const { payload, ...restParameters } = parameters try { - const { ...restPayload } = payload - const transformedPayload = { - ...restPayload, - } - - const { data } = await HttpServer({ accessToken }).post( + const { data } = await HttpServer(restParameters).post( '/api/tag/create', - transformedPayload, + payload, ) return tagsResponseSchema.parse(data) } catch (error) { diff --git a/app/apis/admin/update-category.ts b/app/apis/admin/update-category.ts index 0be5e0f..a9e520e 100644 --- a/app/apis/admin/update-category.ts +++ b/app/apis/admin/update-category.ts @@ -15,10 +15,10 @@ type TParameters = { } export const updateCategoryRequest = async (parameters: TParameters) => { - const { accessToken, payload } = parameters + const { payload, ...restParameters } = parameters + const { id, ...restPayload } = payload try { - const { id, ...restPayload } = payload - const { data } = await HttpServer({ accessToken }).put( + const { data } = await HttpServer(restParameters).put( `/api/category/${id}/update`, restPayload, ) diff --git a/app/apis/admin/update-news.ts b/app/apis/admin/update-news.ts index 806f801..e1a646e 100644 --- a/app/apis/admin/update-news.ts +++ b/app/apis/admin/update-news.ts @@ -15,16 +15,16 @@ type TParameter = { } export const updateNewsRequest = async (parameters: TParameter) => { - const { accessToken, payload } = parameters + const { payload, ...restParameters } = parameters + const { categories, tags, id, live_at, ...restPayload } = payload + const transformedPayload = { + ...restPayload, + categories: categories.map((category) => category?.id), + tags: tags?.map((tag) => tag?.id) || [], + live_at: new Date(live_at).toISOString(), + } try { - const { categories, tags, id, ...restPayload } = payload - const transformedPayload = { - ...restPayload, - categories: categories.map((category) => category?.id), - tags: tags?.map((tag) => tag?.id) || [], - live_at: new Date(payload?.live_at).toISOString(), - } - const { data } = await HttpServer({ accessToken }).put( + const { data } = await HttpServer(restParameters).put( `/api/news/${id}/update`, transformedPayload, ) diff --git a/app/apis/common/get-news-by-slug.ts b/app/apis/common/get-news-by-slug.ts index c676c7f..a46f417 100644 --- a/app/apis/common/get-news-by-slug.ts +++ b/app/apis/common/get-news-by-slug.ts @@ -12,9 +12,9 @@ type TParameters = { } & THttpServer export const getNewsBySlug = async (parameters: TParameters) => { - const { slug, accessToken } = parameters + const { slug, ...restParameters } = parameters try { - const { data } = await HttpServer({ accessToken }).get(`/api/news/${slug}`) + const { data } = await HttpServer(restParameters).get(`/api/news/${slug}`) return dataResponseSchema.parse(data) } catch (error) { // eslint-disable-next-line unicorn/no-useless-promise-resolve-reject diff --git a/app/apis/news/register-user.ts b/app/apis/news/register-user.ts index be65868..1732b2b 100644 --- a/app/apis/news/register-user.ts +++ b/app/apis/news/register-user.ts @@ -4,12 +4,12 @@ import { HttpServer } from '~/libs/http-server' import { loginResponseSchema } from './login-user' export const userRegisterRequest = async (payload: TRegisterSchema) => { + const { subscribe_plan, ...restPayload } = payload + const transformedPayload = { + ...restPayload, + subscribe_plan_id: subscribe_plan.id, + } try { - const { subscribe_plan, ...restPayload } = payload - const transformedPayload = { - ...restPayload, - subscribe_plan_id: subscribe_plan.id, - } const { data } = await HttpServer().post( '/api/user/register', transformedPayload,