diff --git a/epess-database b/epess-database index e630599..ea7fa4a 160000 --- a/epess-database +++ b/epess-database @@ -1 +1 @@ -Subproject commit e63059910ad96168b9033f4ce0c02dfd6ee2f2e8 +Subproject commit ea7fa4ae6ffef656bc4efed3f4d6a0000449dda5 diff --git a/src/Prisma/prisma.service.ts b/src/Prisma/prisma.service.ts index 33e5c95..ea4b485 100644 --- a/src/Prisma/prisma.service.ts +++ b/src/Prisma/prisma.service.ts @@ -1,15 +1,14 @@ import { - ConsoleLogger, INestApplication, Injectable, + Logger, OnModuleInit, } from '@nestjs/common'; import { PrismaClient } from '@prisma/client'; @Injectable() export class PrismaService extends PrismaClient implements OnModuleInit { - private readonly logger = new ConsoleLogger(PrismaService.name); - + private readonly logger = new Logger(PrismaService.name); constructor() { super({ log: [ @@ -22,7 +21,7 @@ export class PrismaService extends PrismaClient implements OnModuleInit { level: 'error', }, { - emit: 'event', + emit: 'stdout', level: 'info', }, { @@ -30,6 +29,7 @@ export class PrismaService extends PrismaClient implements OnModuleInit { level: 'warn', }, ], + errorFormat: 'pretty', }); } diff --git a/src/RefundTicket/refundticket.schema.ts b/src/RefundTicket/refundticket.schema.ts index 4562428..ab440ba 100644 --- a/src/RefundTicket/refundticket.schema.ts +++ b/src/RefundTicket/refundticket.schema.ts @@ -62,7 +62,7 @@ export class RefundTicketSchema extends PothosSchema { orderBy: args.orderBy ?? undefined, cursor: args.cursor ?? undefined, take: args.take ?? 10, - skip: args.skip ?? 0, + skip: args.skip ?? undefined, }); }, }), diff --git a/src/Schedule/schedule.schema.ts b/src/Schedule/schedule.schema.ts index 0739a24..e14fc80 100644 --- a/src/Schedule/schedule.schema.ts +++ b/src/Schedule/schedule.schema.ts @@ -54,7 +54,7 @@ export class ScheduleSchema extends PothosSchema { resolve: async (query, root, args, ctx, info) => { return await this.prisma.schedule.findMany({ ...query, - skip: args.skip ?? 0, + skip: args.skip ?? undefined, take: args.take ?? 10, orderBy: args.orderBy ?? undefined, where: args.filter ?? undefined, diff --git a/src/Service/service.schema.ts b/src/Service/service.schema.ts index ec07e93..095337e 100644 --- a/src/Service/service.schema.ts +++ b/src/Service/service.schema.ts @@ -111,7 +111,7 @@ export class ServiceSchema extends PothosSchema { ...query, where: args.filter ?? undefined, orderBy: args.orderBy ?? undefined, - skip: args.skip ?? 0, + skip: args.skip ?? undefined, take: args.take ?? 10, }); }, diff --git a/src/ServiceAndCategory/serviceandcategory.schema.ts b/src/ServiceAndCategory/serviceandcategory.schema.ts index ea9f6d5..c95c949 100644 --- a/src/ServiceAndCategory/serviceandcategory.schema.ts +++ b/src/ServiceAndCategory/serviceandcategory.schema.ts @@ -49,7 +49,7 @@ export class ServiceAndCategorySchema extends PothosSchema { resolve: async (query, root, args, ctx, info) => { return await this.prisma.serviceAndCategory.findMany({ ...query, - skip: args.skip ?? 0, + skip: args.skip ?? undefined, take: args.take ?? 10, orderBy: args.orderBy ?? undefined, where: args.filter ?? undefined, diff --git a/src/ServiceFeedback/servicefeedback.schema.ts b/src/ServiceFeedback/servicefeedback.schema.ts index f1ba4a7..cad8f6d 100644 --- a/src/ServiceFeedback/servicefeedback.schema.ts +++ b/src/ServiceFeedback/servicefeedback.schema.ts @@ -68,7 +68,7 @@ export class ServiceFeedbackSchema extends PothosSchema { resolve: async (query, root, args, ctx, info) => { return await this.prisma.serviceFeedback.findMany({ ...query, - skip: args.skip ?? 0, + skip: args.skip ?? undefined, take: args.take ?? 10, orderBy: args.orderBy ?? undefined, where: args.filter ?? undefined, diff --git a/src/ServiceMeetingRoom/servicemeetingroom.schema.ts b/src/ServiceMeetingRoom/servicemeetingroom.schema.ts index 2defc82..fc8c36f 100644 --- a/src/ServiceMeetingRoom/servicemeetingroom.schema.ts +++ b/src/ServiceMeetingRoom/servicemeetingroom.schema.ts @@ -52,7 +52,7 @@ export class ServiceMeetingRoomSchema extends PothosSchema { resolve: async (query, root, args, ctx, info) => { return await this.prisma.serviceMeetingRoom.findMany({ ...query, - skip: args.skip ?? 0, + skip: args.skip ?? undefined, take: args.take ?? 10, orderBy: args.orderBy ?? undefined, where: args.filter ?? undefined, diff --git a/src/UploadedFile/uploadedfile.schema.ts b/src/UploadedFile/uploadedfile.schema.ts index 073a890..71238cd 100644 --- a/src/UploadedFile/uploadedfile.schema.ts +++ b/src/UploadedFile/uploadedfile.schema.ts @@ -99,7 +99,7 @@ export class UploadedFileSchema extends PothosSchema { resolve: async (query, root, args) => { const files = await this.prisma.uploadedFile.findMany({ ...query, - skip: args.skip ?? 0, + skip: args.skip ?? undefined, take: args.take ?? 10, orderBy: args.orderBy ?? undefined, where: args.filter ?? undefined, diff --git a/src/User/user.schema.ts b/src/User/user.schema.ts index ecf3559..1efbbcd 100644 --- a/src/User/user.schema.ts +++ b/src/User/user.schema.ts @@ -72,7 +72,7 @@ export class UserSchema extends PothosSchema { return await this.prisma.user.findMany({ ...query, take: args.take ?? 10, - skip: args.skip ?? 0, + skip: args.skip ?? undefined, orderBy: args.orderBy ?? undefined, where: args.filter ?? undefined, }); diff --git a/src/Workshop/workshop.schema.ts b/src/Workshop/workshop.schema.ts index fc9dad3..1664e56 100644 --- a/src/Workshop/workshop.schema.ts +++ b/src/Workshop/workshop.schema.ts @@ -113,7 +113,7 @@ export class WorkshopSchema extends PothosSchema { resolve: async (query, root, args, ctx, info) => { return await this.prisma.workshop.findMany({ ...query, - skip: args.skip ?? 0, + skip: args.skip ?? undefined, take: args.take ?? 10, orderBy: args.orderBy ?? undefined, where: args.filter ?? undefined, diff --git a/src/WorkshopMeetingRoom/workshopmeetingroom.schema.ts b/src/WorkshopMeetingRoom/workshopmeetingroom.schema.ts index c2afada..14751e6 100644 --- a/src/WorkshopMeetingRoom/workshopmeetingroom.schema.ts +++ b/src/WorkshopMeetingRoom/workshopmeetingroom.schema.ts @@ -30,4 +30,34 @@ export class WorkshopMeetingRoomSchema extends PothosSchema { }), }); } + + @Pothos() + init(): void { + this.builder.queryFields((t) => ({ + workshopMeetingRoom: t.prismaField({ + type: this.workshopMeetingRoom(), + args: this.builder.generator.findUniqueArgs('WorkshopMeetingRoom'), + resolve: async (query, root, args, ctx, info) => { + return await this.prisma.workshopMeetingRoom.findUnique({ + ...query, + where: args.where, + }); + }, + }), + workshopMeetingRooms: t.prismaField({ + type: [this.workshopMeetingRoom()], + args: this.builder.generator.findManyArgs('WorkshopMeetingRoom'), + resolve: async (query, root, args, ctx, info) => { + return await this.prisma.workshopMeetingRoom.findMany({ + ...query, + where: args.filter ?? undefined, + orderBy: args.orderBy ?? undefined, + cursor: args.cursor ?? undefined, + take: args.take ?? 10, + skip: args.skip ?? undefined, + }); + }, + }), + })); + } } diff --git a/src/WorkshopSubscription/workshopsubscription.schema.ts b/src/WorkshopSubscription/workshopsubscription.schema.ts index 543a3f9..8c915eb 100644 --- a/src/WorkshopSubscription/workshopsubscription.schema.ts +++ b/src/WorkshopSubscription/workshopsubscription.schema.ts @@ -60,7 +60,7 @@ export class WorkshopSubscriptionSchema extends PothosSchema { resolve: async (query, root, args, ctx, info) => { return await this.prisma.workshopSubscription.findMany({ ...query, - skip: args.skip ?? 0, + skip: args.skip ?? undefined, take: args.take ?? 10, orderBy: args.orderBy ?? undefined, where: args.filter ?? undefined,