Merge pull request #22 from denssle/events-in-profile

Events in profile

package.json

@@ -10,7 +10,7 @@
 		"check:watch": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json --watch",
 		"prettier lint": "prettier --plugin-search-dir . --check . && eslint .",
 		"prettier format": "prettier --plugin-search-dir . --write .",
-		"npm outdated": "npm outdated",
+		"npx update dependencies": "npx npm-check-updates -u",
 		"npm i": "npm install",
 		"npm ci": "npm ci",
 		"npm update": "npm update",
@@ -20,36 +20,36 @@
 		"svelte-check": "svelte-check"
 	},
 	"devDependencies": {
-		"@babel/core": "^7.23.2",
-		"@babel/preset-env": "^7.23.2",
-		"@babel/preset-typescript": "^7.23.2",
+		"@babel/core": "^7.24.7",
+		"@babel/preset-env": "^7.24.7",
+		"@babel/preset-typescript": "^7.24.7",
 		"@jest/globals": "^29.7.0",
-		"@sveltejs/adapter-auto": "^3.0.0",
-		"@sveltejs/kit": "^2.0.0",
-		"@sveltejs/vite-plugin-svelte": "^3.0.0",
-		"@types/jest": "^29.5.8",
-		"@typescript-eslint/eslint-plugin": "^7.8.0",
-		"@typescript-eslint/parser": "^7.8.0",
+		"@sveltejs/adapter-auto": "^3.2.2",
+		"@sveltejs/kit": "^2.5.17",
+		"@sveltejs/vite-plugin-svelte": "^3.1.1",
+		"@types/jest": "^29.5.12",
+		"@typescript-eslint/eslint-plugin": "^7.13.1",
+		"@typescript-eslint/parser": "^7.13.1",
 		"babel-jest": "^29.7.0",
 		"eslint": "^8.28.0",
 		"eslint-config-prettier": "^9.0.0",
 		"eslint-plugin-svelte": "^2.33.0",
 		"jest": "^29.7.0",
-		"prettier": "^3.0.2",
-		"prettier-plugin-svelte": "^3.0.3",
-		"svelte": "^4.2.0",
-		"svelte-check": "^3.5.0",
-		"ts-jest": "^29.1.1",
-		"ts-node": "^10.9.1",
-		"tslib": "^2.6.2",
-		"typescript": "^5.2.2",
-		"vite": "^5.0.0"
+		"prettier": "^3.3.2",
+		"prettier-plugin-svelte": "^3.2.5",
+		"svelte": "^4.2.18",
+		"svelte-check": "^3.8.1",
+		"ts-jest": "^29.1.5",
+		"ts-node": "^10.9.2",
+		"tslib": "^2.6.3",
+		"typescript": "^5.5.2",
+		"vite": "^5.3.1"
 	},
 	"type": "module",
 	"dependencies": {
 		"bcrypt-ts": "^5.0.2",
-		"mariadb": "^3.3.0",
-		"sequelize": "^6.37.1",
+		"mariadb": "^3.3.1",
+		"sequelize": "^6.37.3",
 		"sequelize-cli": "^6.6.2"
 	}
 }

src/lib/models/user/VisitingFestival.ts

@@ -0,0 +1,4 @@
+export interface VisitingFestival {
+	festivalId: string;
+	festivalName: string;
+}

src/lib/services/festivalEvent.service.ts → src/lib/services/festival-event.service.ts

@@ -12,7 +12,12 @@ import {
 import { Model } from 'sequelize';
 import { SessionTokenUser } from '$lib/models/user/SessionTokenUser';
 import { ChangeResult } from '$lib/models/updates/ChangeResult';
-import { mapGuestInformationToFrontendGuestInformation } from '$lib/services/guestInformation.service';
+import {
+	getAllActiveGuestInformation,
+	mapGuestInformationToFrontendGuestInformation
+} from '$lib/services/guest-information.service';
+import { BackendGuestInformation } from '$lib/models/guestInformation/BackendGuestInformation';
+import { VisitingFestival } from '$lib/models/user/VisitingFestival';
 
 export async function getAllFestivals(): Promise<FrontendFestivalEvent[]> {
 	const allFestivals = await FestivalEvent.findAll({ include: GuestInformation, order: [['startDate', 'DESC']] });
@@ -145,3 +150,20 @@ async function parseToFrontend(festival: BackendFestivalEvent): Promise<Frontend
 function isChangeAllowed(id: string, dataValues: FestivalEventAttributes): boolean {
 	return id === dataValues.UserId;
 }
+
+export async function getFestivalYouVisit(userId: string): Promise<VisitingFestival[]> {
+	const activeInfos: BackendGuestInformation[] = await getAllActiveGuestInformation(userId);
+	const loading: Promise<BackendFestivalEvent | null>[] = activeInfos.map((value) =>
+		getFestival(value.FestivalEventId)
+	);
+	const result: VisitingFestival[] = [];
+	for (const fest of await Promise.all(loading)) {
+		if (fest !== null) {
+			result.push({
+				festivalId: fest.id,
+				festivalName: fest.name
+			});
+		}
+	}
+	return result;
+}

src/lib/services/guestInformation.service.ts → src/lib/services/guest-information.service.ts

@@ -2,7 +2,10 @@ import type { BackendUser } from '$lib/models/user/BackendUser';
 import { SessionTokenUser } from '$lib/models/user/SessionTokenUser';
 import type { BaseGuestInformation } from '$lib/models/guestInformation/BaseGuestInformation';
 import { GuestInformation } from '$lib/db/db';
-import { GuestInformationAttributes } from '$lib/db/attributes/guestInformation.attributes';
+import {
+	GuestInformationAttributes,
+	mapToBackendGuestInformation
+} from '$lib/db/attributes/guestInformation.attributes';
 import type { BackendGuestInformation } from '$lib/models/guestInformation/BackendGuestInformation';
 import type { FrontendGuestInformation } from '$lib/models/guestInformation/FrontendGuestInformation';
 import { loadFrontEndUserById } from '$lib/services/user.service';
@@ -75,7 +78,14 @@ export async function mapGuestInformationToFrontendGuestInformation(
 	for (const information of guestInformation) {
 		const userById = await loadFrontEndUserById(information.UserId);
 		if (userById) {
-			result.push({ user: userById, ...information });
+			result.push({
+				user: userById,
+				coming: information.coming,
+				numberOfOtherGuests: information.numberOfOtherGuests,
+				drink: information.drink,
+				comment: information.comment,
+				food: information.food
+			});
 		}
 	}
 	return result;
@@ -89,3 +99,13 @@ async function getGuestInformationModel(userId: string, festivalId: string) {
 		}
 	});
 }
+
+export async function getAllActiveGuestInformation(userId: string): Promise<BackendGuestInformation[]> {
+	const infos = await GuestInformation.findAll({
+		where: {
+			UserId: userId,
+			coming: true
+		}
+	});
+	return infos.map((value) => mapToBackendGuestInformation(value.dataValues));
+}

src/routes/+layout.svelte

@@ -72,7 +72,8 @@
 		-webkit-user-select: none; /*Safari*/
 		-moz-user-select: none; /*Firefox*/
 		caret-color: transparent;
-		min-width: 8vw;
+		padding-left: 1rem;
+		padding-right: 1rem;
 	}
 
 	:global(input::-webkit-outer-spin-button) {

src/routes/+page.server.ts

@@ -1,4 +1,4 @@
-import { getAllFestivals } from '$lib/services/festivalEvent.service';
+import { getAllFestivals } from '$lib/services/festival-event.service';
 import type { FrontendFestivalEvent } from '$lib/models/festivalEvent/FrontendFestivalEvent';
 import type { PageServerLoad } from '../../.svelte-kit/types/src/routes/$types';
 

src/routes/festival/[festival_id]/+page.server.ts

@@ -5,7 +5,7 @@ import type {
 import type { Cookies } from '@sveltejs/kit';
 import { error } from '@sveltejs/kit';
 import type { FrontendFestivalEvent } from '$lib/models/festivalEvent/FrontendFestivalEvent';
-import { getFrontEndFestival } from '$lib/services/festivalEvent.service';
+import { getFrontEndFestival } from '$lib/services/festival-event.service';
 import { extractUser } from '$lib/services/user.service';
 import type { FestivalTransferData } from '$lib/models/FestivalTransferData';
 import { SessionTokenUser } from '$lib/models/user/SessionTokenUser';

src/routes/festival/[festival_id]/+server.ts

@@ -1,4 +1,4 @@
-import { deleteFestival } from '$lib/services/festivalEvent.service';
+import { deleteFestival } from '$lib/services/festival-event.service';
 import { extractUser } from '$lib/services/user.service';
 import type { RequestHandler } from '@sveltejs/kit';
 import { ChangeResult } from '$lib/models/updates/ChangeResult';

src/routes/festival/[festival_id]/cancel-invitation/+server.ts

@@ -1,6 +1,6 @@
 import { extractUser } from '$lib/services/user.service';
 import type { RequestHandler } from '@sveltejs/kit';
-import { leaveFestival } from '$lib/services/guestInformation.service';
+import { leaveFestival } from '$lib/services/guest-information.service';
 
 export const POST: RequestHandler = async ({ cookies, params, request }) => {
 	const blob: Blob = await request.blob();

src/routes/festival/[festival_id]/edit/+page.server.ts

@@ -4,7 +4,7 @@ import type {
 	PageServerLoad,
 	RouteParams
 } from '../../../../../.svelte-kit/types/src/routes/festival/[festival_id]/edit/$types';
-import { getFrontEndFestival, updateFestival } from '$lib/services/festivalEvent.service';
+import { getFrontEndFestival, updateFestival } from '$lib/services/festival-event.service';
 import { extractUser } from '$lib/services/user.service';
 import { getDateFromString } from '$lib/utils/date.util';
 import type { FrontendFestivalEvent } from '$lib/models/festivalEvent/FrontendFestivalEvent';

src/routes/festival/[festival_id]/join/+server.ts

@@ -1,7 +1,7 @@
 import { extractUser } from '$lib/services/user.service';
 import type { RequestHandler } from '@sveltejs/kit';
 import type { BaseGuestInformation } from '$lib/models/guestInformation/BaseGuestInformation';
-import { joinFestival } from '$lib/services/guestInformation.service';
+import { joinFestival } from '$lib/services/guest-information.service';
 
 export const POST: RequestHandler = async ({ cookies, params, request }): Promise<Response> => {
 	const blob: Blob = await request.blob();

src/routes/festival/new/+page.server.ts

@@ -2,7 +2,7 @@ import type { FrontendFestivalEvent } from '$lib/models/festivalEvent/FrontendFe
 import { extractUser } from '$lib/services/user.service';
 import { getDateFromString } from '$lib/utils/date.util';
 import { type Actions, Cookies, redirect } from '@sveltejs/kit';
-import { createFestival } from '$lib/services/festivalEvent.service';
+import { createFestival } from '$lib/services/festival-event.service';
 
 export const actions: Actions = {
 	default: async ({ cookies, request }: { cookies: Cookies; request: Request }): Promise<Response | undefined> => {