Imbus/TTime
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix for getWeeklyReportsForUser

Browse source
This commit is contained in:
al8763be 2024-03-20 14:00:00 +01:00
parent 0b6edd359e
commit d41bfcf888
1 changed files with 14 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

22
frontend/src/API/API.ts
View file

@ -4,6 +4,7 @@ import {
User,
Project,
NewProject,
WeeklyReport,
} from "../Types/goTypes";
// This type of pattern should be hard to misuse
@ -47,11 +48,12 @@ interface API {
projectName: string,
week: string,
token: string,
): Promise<APIResponse<NewWeeklyReport>>;
): Promise<APIResponse<WeeklyReport>>;
getWeeklyReportsForProject(
username: string,
projectName: string,
token: string,
): Promise<APIResponse<NewWeeklyReport[]>>;
): Promise<APIResponse<WeeklyReport[]>>;
/** Gets all the projects of a user*/
getUserProjects(token: string): Promise<APIResponse<Project[]>>;
/** Gets a project from id*/
@ -250,7 +252,7 @@ export const api: API = {
projectName: string,
week: string,
token: string,
): Promise<APIResponse<NewWeeklyReport>> {
): Promise<APIResponse<WeeklyReport>> {
try {
const response = await fetch("/api/getWeeklyReport", {
method: "GET",
@ -264,7 +266,7 @@ export const api: API = {
if (!response.ok) {
return { success: false, message: "Failed to get weekly report" };
} else {
const data = (await response.json()) as NewWeeklyReport;
const data = (await response.json()) as WeeklyReport;
return { success: true, data };
}
} catch (e) {
@ -272,15 +274,19 @@ export const api: API = {
}
},
async getWeeklyReportsForProject(projectName: string, token: string) {
async getWeeklyReportsForProject(
username: string,
projectName: string,
token: string
): Promise<APIResponse<WeeklyReport[]>> {
try {
const response = await fetch("/api/getWeeklyReportsForProject", {
const response = await fetch("/api/getWeeklyReportsUser", {
method: "GET",
headers: {
"Content-Type": "application/json",
Authorization: "Bearer " + token,
},
body: JSON.stringify({ projectName }),
body: JSON.stringify({ username, projectName }),
});
if (!response.ok) {
@ -289,7 +295,7 @@ export const api: API = {
message: "Failed to get weekly reports for project",
};
} else {
const data = (await response.json()) as NewWeeklyReport[];
const data = (await response.json()) as WeeklyReport[];
return { success: true, data };
}
} catch (e) {