Refactor stores and types for improved data handling and schema definitions
All checks were successful
SteamWarCI Build successful
All checks were successful
SteamWarCI Build successful
- Consolidated player fetching logic in stores.ts to utilize dataRepo. - Introduced teams fetching logic in stores.ts. - Updated permissions structure in stores.ts for better clarity. - Enhanced data schemas in data.ts with new ResponseUser and ResponseTeam schemas. - Expanded event-related schemas in event.ts to include groups, relations, and event creation/update structures. - Improved code formatting for consistency and readability across files.
This commit is contained in:
@@ -17,12 +17,26 @@
|
||||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
import type {ExtendedEvent, ShortEvent, SWEvent} from "@type/event";
|
||||
import {fetchWithToken, tokenStore} from "./repo";
|
||||
import {ExtendedEventSchema, ShortEventSchema, SWEventSchema} from "@type/event.js";
|
||||
import {z} from "zod";
|
||||
import type {Dayjs} from "dayjs";
|
||||
import {derived} from "svelte/store";
|
||||
import type { ExtendedEvent, ShortEvent, SWEvent, EventFight, ResponseGroups, ResponseRelation, ResponseTeam } from "@type/event";
|
||||
import { fetchWithToken, tokenStore } from "./repo";
|
||||
import {
|
||||
ExtendedEventSchema,
|
||||
ShortEventSchema,
|
||||
SWEventSchema,
|
||||
EventFightSchema,
|
||||
ResponseGroupsSchema,
|
||||
ResponseRelationSchema,
|
||||
ResponseTeamSchema,
|
||||
CreateEventGroupSchema,
|
||||
UpdateEventGroupSchema,
|
||||
CreateEventRelationSchema,
|
||||
UpdateEventRelationSchema,
|
||||
} from "@type/event.js";
|
||||
import type { CreateEventGroup, UpdateEventGroup, CreateEventRelation, UpdateEventRelation } from "@type/event.js";
|
||||
import { z } from "zod";
|
||||
import type { Dayjs } from "dayjs";
|
||||
import { derived } from "svelte/store";
|
||||
import { ResponseUserSchema } from "@components/types/data";
|
||||
|
||||
export interface CreateEvent {
|
||||
name: string;
|
||||
@@ -42,19 +56,25 @@ export interface UpdateEvent {
|
||||
removeReferee?: string[] | null;
|
||||
}
|
||||
|
||||
export interface ResponseUser {
|
||||
name: string;
|
||||
uuid: string;
|
||||
prefix: string;
|
||||
perms: string[];
|
||||
}
|
||||
|
||||
export class EventRepo {
|
||||
constructor(private token: string) {
|
||||
}
|
||||
constructor(private token: string) {}
|
||||
|
||||
public async listEvents(): Promise<ShortEvent[]> {
|
||||
return await fetchWithToken(this.token, "/events")
|
||||
.then(value => value.json())
|
||||
.then(value => z.array(ShortEventSchema).parse(value));
|
||||
.then((value) => value.json())
|
||||
.then((value) => z.array(ShortEventSchema).parse(value));
|
||||
}
|
||||
|
||||
public async getEvent(id: string): Promise<ExtendedEvent> {
|
||||
return await fetchWithToken(this.token, `/events/${id}`)
|
||||
.then(value => value.json())
|
||||
.then((value) => value.json())
|
||||
.then(ExtendedEventSchema.parse);
|
||||
}
|
||||
|
||||
@@ -66,7 +86,8 @@ export class EventRepo {
|
||||
start: +event.start,
|
||||
end: +event.end,
|
||||
}),
|
||||
}).then(value => value.json())
|
||||
})
|
||||
.then((value) => value.json())
|
||||
.then(SWEventSchema.parse);
|
||||
}
|
||||
|
||||
@@ -87,7 +108,8 @@ export class EventRepo {
|
||||
headers: {
|
||||
"Content-Type": "application/json",
|
||||
},
|
||||
}).then(value => value.json())
|
||||
})
|
||||
.then((value) => value.json())
|
||||
.then(SWEventSchema.parse);
|
||||
}
|
||||
|
||||
@@ -98,6 +120,150 @@ export class EventRepo {
|
||||
|
||||
return res.ok;
|
||||
}
|
||||
|
||||
// Fights
|
||||
public async listFights(eventId: string): Promise<EventFight[]> {
|
||||
return await fetchWithToken(this.token, `/events/${eventId}/fights`)
|
||||
.then((value) => value.json())
|
||||
.then((value) => z.array(EventFightSchema).parse(value));
|
||||
}
|
||||
public async createFight(eventId: string, fight: any): Promise<EventFight> {
|
||||
return await fetchWithToken(this.token, `/events/${eventId}/fights`, {
|
||||
method: "POST",
|
||||
body: JSON.stringify(fight),
|
||||
headers: { "Content-Type": "application/json" },
|
||||
})
|
||||
.then((value) => value.json())
|
||||
.then(EventFightSchema.parse);
|
||||
}
|
||||
public async deleteFight(eventId: string, fightId: string): Promise<boolean> {
|
||||
const res = await fetchWithToken(this.token, `/events/${eventId}/fights/${fightId}`, {
|
||||
method: "DELETE",
|
||||
});
|
||||
return res.ok;
|
||||
}
|
||||
|
||||
// Groups
|
||||
public async listGroups(eventId: string): Promise<ResponseGroups[]> {
|
||||
return await fetchWithToken(this.token, `/events/${eventId}/groups`)
|
||||
.then((value) => value.json())
|
||||
.then((value) => z.array(ResponseGroupsSchema).parse(value));
|
||||
}
|
||||
public async createGroup(eventId: string, group: CreateEventGroup): Promise<ResponseGroups> {
|
||||
CreateEventGroupSchema.parse(group);
|
||||
return await fetchWithToken(this.token, `/events/${eventId}/groups`, {
|
||||
method: "POST",
|
||||
body: JSON.stringify(group),
|
||||
headers: { "Content-Type": "application/json" },
|
||||
})
|
||||
.then((value) => value.json())
|
||||
.then(ResponseGroupsSchema.parse);
|
||||
}
|
||||
public async getGroup(eventId: string, groupId: string): Promise<ResponseGroups> {
|
||||
return await fetchWithToken(this.token, `/events/${eventId}/groups/${groupId}`)
|
||||
.then((value) => value.json())
|
||||
.then(ResponseGroupsSchema.parse);
|
||||
}
|
||||
public async updateGroup(eventId: string, groupId: string, group: UpdateEventGroup): Promise<ResponseGroups> {
|
||||
UpdateEventGroupSchema.parse(group);
|
||||
return await fetchWithToken(this.token, `/events/${eventId}/groups/${groupId}`, {
|
||||
method: "PUT",
|
||||
body: JSON.stringify(group),
|
||||
headers: { "Content-Type": "application/json" },
|
||||
})
|
||||
.then((value) => value.json())
|
||||
.then(ResponseGroupsSchema.parse);
|
||||
}
|
||||
public async deleteGroup(eventId: string, groupId: string): Promise<boolean> {
|
||||
const res = await fetchWithToken(this.token, `/events/${eventId}/groups/${groupId}`, {
|
||||
method: "DELETE",
|
||||
});
|
||||
return res.ok;
|
||||
}
|
||||
|
||||
// Relations
|
||||
public async listRelations(eventId: string): Promise<ResponseRelation[]> {
|
||||
return await fetchWithToken(this.token, `/events/${eventId}/relations`)
|
||||
.then((value) => value.json())
|
||||
.then((value) => z.array(ResponseRelationSchema).parse(value));
|
||||
}
|
||||
public async createRelation(eventId: string, relation: CreateEventRelation): Promise<ResponseRelation> {
|
||||
CreateEventRelationSchema.parse(relation);
|
||||
return await fetchWithToken(this.token, `/events/${eventId}/relations`, {
|
||||
method: "POST",
|
||||
body: JSON.stringify(relation),
|
||||
headers: { "Content-Type": "application/json" },
|
||||
})
|
||||
.then((value) => value.json())
|
||||
.then(ResponseRelationSchema.parse);
|
||||
}
|
||||
public async getRelation(eventId: string, relationId: string): Promise<ResponseRelation> {
|
||||
return await fetchWithToken(this.token, `/events/${eventId}/relations/${relationId}`)
|
||||
.then((value) => value.json())
|
||||
.then(ResponseRelationSchema.parse);
|
||||
}
|
||||
public async updateRelation(eventId: string, relationId: string, relation: UpdateEventRelation): Promise<ResponseRelation> {
|
||||
UpdateEventRelationSchema.parse(relation);
|
||||
return await fetchWithToken(this.token, `/events/${eventId}/relations/${relationId}`, {
|
||||
method: "PUT",
|
||||
body: JSON.stringify(relation),
|
||||
headers: { "Content-Type": "application/json" },
|
||||
})
|
||||
.then((value) => value.json())
|
||||
.then(ResponseRelationSchema.parse);
|
||||
}
|
||||
public async deleteRelation(eventId: string, relationId: string): Promise<boolean> {
|
||||
const res = await fetchWithToken(this.token, `/events/${eventId}/relations/${relationId}`, {
|
||||
method: "DELETE",
|
||||
});
|
||||
return res.ok;
|
||||
}
|
||||
|
||||
// Teams
|
||||
public async listTeams(eventId: string): Promise<ResponseTeam[]> {
|
||||
return await fetchWithToken(this.token, `/events/${eventId}/teams`)
|
||||
.then((value) => value.json())
|
||||
.then((value) => z.array(ResponseTeamSchema).parse(value));
|
||||
}
|
||||
public async updateTeams(eventId: string, teams: number[]): Promise<boolean> {
|
||||
const res = await fetchWithToken(this.token, `/events/${eventId}/teams`, {
|
||||
method: "PUT",
|
||||
body: JSON.stringify(teams),
|
||||
headers: { "Content-Type": "application/json" },
|
||||
});
|
||||
return res.ok;
|
||||
}
|
||||
public async deleteTeams(eventId: string, teams: number[]): Promise<boolean> {
|
||||
const res = await fetchWithToken(this.token, `/events/${eventId}/teams`, {
|
||||
method: "DELETE",
|
||||
body: JSON.stringify(teams),
|
||||
headers: { "Content-Type": "application/json" },
|
||||
});
|
||||
return res.ok;
|
||||
}
|
||||
|
||||
// Referees
|
||||
public async listReferees(eventId: string): Promise<ResponseUser[]> {
|
||||
return await fetchWithToken(this.token, `/events/${eventId}/referees`)
|
||||
.then((value) => value.json())
|
||||
.then((value) => z.array(ResponseUserSchema).parse(value));
|
||||
}
|
||||
public async updateReferees(eventId: string, refereeUuids: string[]): Promise<boolean> {
|
||||
const res = await fetchWithToken(this.token, `/events/${eventId}/referees`, {
|
||||
method: "PUT",
|
||||
body: JSON.stringify(refereeUuids),
|
||||
headers: { "Content-Type": "application/json" },
|
||||
});
|
||||
return res.status === 204;
|
||||
}
|
||||
public async deleteReferees(eventId: string, refereeUuids: string[]): Promise<boolean> {
|
||||
const res = await fetchWithToken(this.token, `/events/${eventId}/referees`, {
|
||||
method: "DELETE",
|
||||
body: JSON.stringify(refereeUuids),
|
||||
headers: { "Content-Type": "application/json" },
|
||||
});
|
||||
return res.status === 204;
|
||||
}
|
||||
}
|
||||
|
||||
export const eventRepo = derived(tokenStore, ($token) => new EventRepo($token));
|
||||
|
||||
Reference in New Issue
Block a user