fix: Task Priorities

ever-co · Dec 2, 2023 · 994638a · 994638a
1 parent 2279712
commit 994638a
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 10 deletions.
diff --git a/apps/web/app/services/client/api/task-priorities.ts b/apps/web/app/services/client/api/task-priorities.ts
@@ -1,5 +1,5 @@
 import { CreateResponse, DeleteResponse, ITaskPrioritiesCreate } from '@app/interfaces';
-import api from '../axios';
+import api, { get } from '../axios';
 
 export function createTaskPrioritiesAPI(data: ITaskPrioritiesCreate, tenantId?: string) {
 	return api.post<CreateResponse<ITaskPrioritiesCreate>>('/task-priorities', data, {
@@ -21,8 +21,18 @@ export function deleteTaskPrioritiesAPI(id: string) {
 	return api.delete<DeleteResponse>(`/task-priorities/${id}`);
 }
 
-export function getTaskPrioritiesList(tenantId: string, organizationId: string, activeTeamId: string | null) {
-	return api.get(
-		`/task-priorities?tenantId=${tenantId}&organizationId=${organizationId}&activeTeamId=${activeTeamId}`
-	);
+export async function getTaskPrioritiesList(
+	tenantId: string,
+	organizationId: string,
+	organizationTeamId: string | null
+) {
+	const endpoint = `/task-priorities?tenantId=${tenantId}&organizationId=${organizationId}&organizationTeamId=${organizationTeamId}`;
+
+	const data = await get(endpoint, true, { tenantId });
+
+	return data;
+
+	// return api.get(
+	// 	`/task-priorities?tenantId=${tenantId}&organizationId=${organizationId}&organizationTeamId=${organizationTeamId}`
+	// );
 }
diff --git a/apps/web/app/services/server/requests/task-priorities.ts b/apps/web/app/services/server/requests/task-priorities.ts
@@ -52,12 +52,12 @@ export function getTaskPrioritiesListRequest(
 	{
 		organizationId,
 		tenantId,
-		activeTeamId
-	}: { tenantId: string; organizationId: string; activeTeamId: string | null },
+		organizationTeamId
+	}: { tenantId: string; organizationId: string; organizationTeamId: string | null },
 	bearer_token: string
 ) {
 	return serverFetch({
-		path: `/task-priorities?tenantId=${tenantId}&organizationId=${organizationId}&organizationTeamId=${activeTeamId}`,
+		path: `/task-priorities?tenantId=${tenantId}&organizationId=${organizationId}&organizationTeamId=${organizationTeamId}`,
 		method: 'GET',
 		bearer_token
 	});

diff --git a/apps/web/pages/api/task-priorities/index.tsx b/apps/web/pages/api/task-priorities/index.tsx
@@ -7,12 +7,12 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
 
 	if (!user) return $res();
 
-	const { activeTeamId } = req.query;
+	const { organizationTeamId } = req.query;
 
 	const par = {
 		tenantId,
 		organizationId,
-		activeTeamId: (activeTeamId as string) || null
+		organizationTeamId: (organizationTeamId as string) || null
 	};
 
 	switch (req.method) {