From 76857b861192972500e4892fdc4dd4af0aab55b6 Mon Sep 17 00:00:00 2001 From: R40fendt Date: Fri, 30 Jan 2026 14:35:01 +0100 Subject: [PATCH] Added Events --- src/app.module.ts | 2 +- src/dto | 2 +- src/events/events.controller.ts | 6 +++--- src/events/events.entity.ts | 18 +++++++++++++++--- src/events/events.service.ts | 4 ++-- src/main.ts | 12 +++++++++--- 6 files changed, 31 insertions(+), 13 deletions(-) diff --git a/src/app.module.ts b/src/app.module.ts index 1c1898b..ff5ae0a 100644 --- a/src/app.module.ts +++ b/src/app.module.ts @@ -12,7 +12,7 @@ import { EventEntity } from './events/events.entity'; GraphQLModule.forRoot({ driver: MercuriusDriver, graphiql: true, - autoSchemaFile: true + autoSchemaFile: true, } as MercuriusDriverConfig), EventsModule, TypeOrmModule.forRoot({ diff --git a/src/dto b/src/dto index 669bc47..3798232 160000 --- a/src/dto +++ b/src/dto @@ -1 +1 @@ -Subproject commit 669bc47276e5566bc1929014d19cfa8ce1922ad8 +Subproject commit 3798232611ef6358d81612c846354637170bf3cd diff --git a/src/events/events.controller.ts b/src/events/events.controller.ts index 64093b9..3df9203 100644 --- a/src/events/events.controller.ts +++ b/src/events/events.controller.ts @@ -1,7 +1,7 @@ import { Controller, Get, Inject, Injectable } from '@nestjs/common'; import { Query } from '@nestjs/graphql'; -import { MyEvent } from 'src/dto/event.dto'; import { EventsService } from './events.service'; +import { EventEntity } from './events.entity'; @Controller('/api/events') export class EventsController { @@ -14,8 +14,8 @@ export class EventsController { ){} @Get("/") - @Query(()=>[MyEvent]) - async events(): Promise{ + @Query(()=>[EventEntity]) + async events(): Promise{ return await this.eventsService.getEvents(); diff --git a/src/events/events.entity.ts b/src/events/events.entity.ts index 15dd1e7..2c27fcb 100644 --- a/src/events/events.entity.ts +++ b/src/events/events.entity.ts @@ -1,33 +1,45 @@ -import { EventType } from "src/dto/event.dto"; +import { Field, ObjectType } from "@nestjs/graphql"; +import { EventType, MyEvent } from "src/dto/event.dto"; import { Column, Entity, PrimaryGeneratedColumn } from "typeorm"; +@ObjectType() @Entity() -export class EventEntity { +export class EventEntity implements MyEvent{ + + @Field() @PrimaryGeneratedColumn() id: number; + @Field() @Column() eventname: string; - @Column({ type: "date" }) + @Field() + @Column({ type: "datetime", default: "1970-01-01 00:00:00" }) datum: Date; + @Field() @Column({ type: "enum", enum: [EventType.fotos, EventType.html, EventType.markdown, EventType.link] }) type: EventType; + @Field() @Column() content: string; + @Field() @Column() minitext: string; + @Field({nullable: true}) @Column({ nullable: true }) link:string; + @Field() @Column() foto: string; + @Field({nullable: true}) @Column({ nullable: true }) formular: number; } \ No newline at end of file diff --git a/src/events/events.service.ts b/src/events/events.service.ts index d195c1f..ae38be7 100644 --- a/src/events/events.service.ts +++ b/src/events/events.service.ts @@ -12,9 +12,9 @@ export class EventsService { ){} - async getEvents(): Promise { + async getEvents(): Promise { - return (await this.eventRepository.find()) as MyEvent[]; + return (await this.eventRepository.find()); diff --git a/src/main.ts b/src/main.ts index 4684be7..d207b83 100644 --- a/src/main.ts +++ b/src/main.ts @@ -5,9 +5,15 @@ import { FastifyContextConfig } from 'fastify'; import { SwaggerModule, DocumentBuilder } from '@nestjs/swagger'; async function bootstrap() { - const app = await NestFactory.create(AppModule, new FastifyAdapter({ - listeningOrigin: "0.0.0.0" - } as FastifyContextConfig)); + const fastifyAdapter=new FastifyAdapter({ + listeningOrigin: "0.0.0.0", + crossOriginIsolated: true + + } as FastifyContextConfig); + + const app = await NestFactory.create(AppModule, fastifyAdapter); + + app.enableCors(); const config = new DocumentBuilder() .setTitle('Ritzenbergen API')