@shizuoka-its/core 0.3.2-alpha.0 → 0.3.2-alpha.1

package/dist/repositories/interfaces/lightningTalk.repository.interface.d.ts

@@ -3,6 +3,14 @@ import type { IBaseRepository } from "./base.repository.interface";
 type DefaultInclude = {
     exhibit: true;
 };
+type AllInclude = {
+    exhibit: {
+        include: {
+            event: true;
+            members: true;
+        };
+    };
+};
 export interface ILightningTalkRepository extends IBaseRepository<Prisma.LightningTalkGetPayload<{
     include: DefaultInclude;
 }>, Prisma.LightningTalkCreateInput, Prisma.LightningTalkUpdateInput, Prisma.LightningTalkFindManyArgs> {
@@ -16,10 +24,10 @@ export interface ILightningTalkRepository extends IBaseRepository<Prisma.Lightni
         include: DefaultInclude;
     }>>;
     findById<T extends Prisma.LightningTalkInclude>(id: string, include?: T): Promise<Prisma.LightningTalkGetPayload<{
-        include: DefaultInclude;
+        include: AllInclude;
     }> | null>;
     findByEventId<T extends Prisma.LightningTalkInclude>(eventId: string, include?: T): Promise<Prisma.LightningTalkGetPayload<{
-        include: DefaultInclude;
+        include: AllInclude;
     }>[]>;
     findMany(args?: Omit<Prisma.LightningTalkFindManyArgs, "include">): Promise<Prisma.LightningTalkGetPayload<{
         include: DefaultInclude;

package/dist/repositories/lightningTalk.repository.d.ts

@@ -4,6 +4,14 @@ import type { ILightningTalkRepository } from "./interfaces/lightningTalk.reposi
 type DefaultInclude = {
     exhibit: true;
 };
+type AllInclude = {
+    exhibit: {
+        include: {
+            event: true;
+            members: true;
+        };
+    };
+};
 export declare class LightningTalkRepository extends BaseRepository<Prisma.LightningTalkGetPayload<{
     include: DefaultInclude;
 }>, Prisma.LightningTalkCreateInput, Prisma.LightningTalkUpdateInput, Prisma.LightningTalkFindManyArgs> implements ILightningTalkRepository {
@@ -18,10 +26,10 @@ export declare class LightningTalkRepository extends BaseRepository<Prisma.Light
         include: DefaultInclude;
     }>>;
     findById(id: string, include?: Prisma.LightningTalkInclude): Promise<Prisma.LightningTalkGetPayload<{
-        include: DefaultInclude;
+        include: AllInclude;
     }> | null>;
     findByEventId(eventId: string, include?: Prisma.LightningTalkInclude): Promise<Prisma.LightningTalkGetPayload<{
-        include: DefaultInclude;
+        include: AllInclude;
     }>[]>;
     findMany(args?: Omit<Prisma.LightningTalkFindManyArgs, "include">): Promise<Prisma.LightningTalkGetPayload<{
         include: DefaultInclude;

package/dist/repositories/lightningTalk.repository.js

@@ -28,7 +28,14 @@ class LightningTalkRepository extends base_repository_1.BaseRepository {
     async findById(id, include) {
         return this.prisma.lightningTalk.findUnique({
             where: { exhibitId: id },
-            include: { ...include, exhibit: true },
+            include: {
+                exhibit: {
+                    include: {
+                        event: true,
+                        members: true,
+                    },
+                },
+            },
         });
     }
     async findByEventId(eventId, include) {
@@ -38,7 +45,14 @@ class LightningTalkRepository extends base_repository_1.BaseRepository {
                     eventId,
                 },
             },
-            include: { ...include, exhibit: true },
+            include: {
+                exhibit: {
+                    include: {
+                        event: true,
+                        members: true,
+                    },
+                },
+            },
         });
     }
     async findMany(args) {

package/dist/services/interfaces/lightningTalk.service.interface.d.ts

@@ -1,5 +1,22 @@
-import type { Exhibit, LightningTalk } from "@prisma/client";
+import type { Prisma } from "@prisma/client";
 import type { IBaseService } from "./base.service.interface";
+export type DefaultInclude = {
+    exhibit: true;
+};
+export type ExhibitInclude = {
+    exhibit: {
+        include: {
+            event: true;
+            members: true;
+        };
+    };
+};
+export type LightningTalkWithExhibit = Prisma.LightningTalkGetPayload<{
+    include: DefaultInclude;
+}>;
+export type LightningTalkWithAll = Prisma.LightningTalkGetPayload<{
+    include: ExhibitInclude;
+}>;
 export interface LightningTalkCreateDTO {
     exhibitId: string;
     startTime: Date;
@@ -11,26 +28,11 @@ export interface LightningTalkUpdateDTO {
     duration?: number;
     slideUrl?: string;
 }
-export interface ILightningTalkService extends IBaseService<LightningTalk & {
-    exhibit: Exhibit;
-}, // 常にexhibitを含む
-LightningTalkCreateDTO, LightningTalkUpdateDTO> {
-    findById(id: string): Promise<(LightningTalk & {
-        exhibit: Exhibit;
-    }) | null>;
-    create(data: LightningTalkCreateDTO): Promise<LightningTalk & {
-        exhibit: Exhibit;
-    }>;
-    update(id: string, data: LightningTalkUpdateDTO): Promise<LightningTalk & {
-        exhibit: Exhibit;
-    }>;
-    delete(id: string): Promise<LightningTalk & {
-        exhibit: Exhibit;
-    }>;
-    findMany(): Promise<(LightningTalk & {
-        exhibit: Exhibit;
-    })[]>;
-    findByEventId(eventId: string): Promise<(LightningTalk & {
-        exhibit: Exhibit;
-    })[]>;
+export interface ILightningTalkService extends IBaseService<LightningTalkWithExhibit, LightningTalkCreateDTO, LightningTalkUpdateDTO> {
+    findById(id: string): Promise<LightningTalkWithAll | null>;
+    create(data: LightningTalkCreateDTO): Promise<LightningTalkWithExhibit>;
+    update(id: string, data: LightningTalkUpdateDTO): Promise<LightningTalkWithExhibit>;
+    delete(id: string): Promise<LightningTalkWithExhibit>;
+    findMany(): Promise<LightningTalkWithExhibit[]>;
+    findByEventId(eventId: string): Promise<LightningTalkWithAll[]>;
 }

package/dist/services/lightningTalk.service.d.ts

@@ -1,29 +1,15 @@
-import type { Exhibit, LightningTalk, Prisma } from "@prisma/client";
+import type { Prisma } from "@prisma/client";
 import type { IExhibitRepository } from "../repositories/interfaces/exhibit.repository.interface";
 import type { ILightningTalkRepository } from "../repositories/interfaces/lightningTalk.repository.interface";
 import { BaseService } from "./base.service";
-import type { ILightningTalkService, LightningTalkCreateDTO, LightningTalkUpdateDTO } from "./interfaces/lightningTalk.service.interface";
-export declare class LightningTalkService extends BaseService<LightningTalk & {
-    exhibit: Exhibit;
-}, LightningTalkCreateDTO, LightningTalkUpdateDTO, Prisma.LightningTalkFindManyArgs, Prisma.LightningTalkCreateInput, Prisma.LightningTalkUpdateInput, ILightningTalkRepository> implements ILightningTalkService {
+import type { ILightningTalkService, LightningTalkCreateDTO, LightningTalkUpdateDTO, LightningTalkWithAll, LightningTalkWithExhibit } from "./interfaces/lightningTalk.service.interface";
+export declare class LightningTalkService extends BaseService<LightningTalkWithExhibit, LightningTalkCreateDTO, LightningTalkUpdateDTO, Prisma.LightningTalkFindManyArgs, Prisma.LightningTalkCreateInput, Prisma.LightningTalkUpdateInput, ILightningTalkRepository> implements ILightningTalkService {
     private readonly exhibitRepository;
     constructor(lightningTalkrepository: ILightningTalkRepository, exhibitRepository: IExhibitRepository);
-    findById(id: string): Promise<(LightningTalk & {
-        exhibit: Exhibit;
-    }) | null>;
-    create(data: LightningTalkCreateDTO): Promise<LightningTalk & {
-        exhibit: Exhibit;
-    }>;
-    update(id: string, data: LightningTalkUpdateDTO): Promise<LightningTalk & {
-        exhibit: Exhibit;
-    }>;
-    delete(id: string): Promise<LightningTalk & {
-        exhibit: Exhibit;
-    }>;
-    findMany(): Promise<(LightningTalk & {
-        exhibit: Exhibit;
-    })[]>;
-    findByEventId(eventId: string): Promise<(LightningTalk & {
-        exhibit: Exhibit;
-    })[]>;
+    findById(id: string): Promise<LightningTalkWithAll | null>;
+    create(data: LightningTalkCreateDTO): Promise<LightningTalkWithExhibit>;
+    update(id: string, data: LightningTalkUpdateDTO): Promise<LightningTalkWithExhibit>;
+    delete(id: string): Promise<LightningTalkWithExhibit>;
+    findMany(): Promise<LightningTalkWithExhibit[]>;
+    findByEventId(eventId: string): Promise<LightningTalkWithAll[]>;
 }

package/dist/services/lightningTalk.service.js

@@ -15,12 +15,10 @@ class LightningTalkService extends base_service_1.BaseService {
         });
     }
     async create(data) {
-        // 展示の存在確認
         const exhibit = await this.exhibitRepository.findById(data.exhibitId);
         if (!exhibit) {
             throw new Error("Exhibit not found");
         }
-        // すでにLTとして登録されていないか確認
         const existingLT = await this.repository.findById(data.exhibitId);
         if (existingLT) {
             throw new Error("This exhibit is already registered as a lightning talk");
@@ -33,7 +31,6 @@ class LightningTalkService extends base_service_1.BaseService {
         });
     }
     async update(id, data) {
-        // LTの存在確認
         const lightningTalk = await this.repository.findById(id);
         if (!lightningTalk) {
             throw new Error("Lightning talk not found");
@@ -45,7 +42,6 @@ class LightningTalkService extends base_service_1.BaseService {
         });
     }
     async delete(id) {
-        // LTの存在確認
         const lightningTalk = await this.repository.findById(id);
         if (!lightningTalk) {
             throw new Error("Lightning talk not found");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shizuoka-its/core",
-  "version": "0.3.2-alpha.0",
+  "version": "0.3.2-alpha.1",
   "description": "ITS core library",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",