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

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

@@ -1,9 +1,36 @@
-import type { Exhibit, LightningTalk, Prisma } from "@prisma/client";
+import type { Prisma } from "@prisma/client";
 import type { IBaseRepository } from "./base.repository.interface";
-export interface ILightningTalkRepository extends IBaseRepository<LightningTalk & {
-    exhibit: Exhibit;
-}, Prisma.LightningTalkCreateInput, Prisma.LightningTalkUpdateInput, Prisma.LightningTalkFindManyArgs> {
-    findByEventId(eventId: string): Promise<(LightningTalk & {
-        exhibit: Exhibit;
-    })[]>;
+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> {
+    create(data: Prisma.LightningTalkCreateInput): Promise<Prisma.LightningTalkGetPayload<{
+        include: DefaultInclude;
+    }>>;
+    update(id: string, data: Prisma.LightningTalkUpdateInput): Promise<Prisma.LightningTalkGetPayload<{
+        include: DefaultInclude;
+    }>>;
+    delete(id: string): Promise<Prisma.LightningTalkGetPayload<{
+        include: DefaultInclude;
+    }>>;
+    findById<T extends Prisma.LightningTalkInclude>(id: string, include?: T): Promise<Prisma.LightningTalkGetPayload<{
+        include: AllInclude;
+    }> | null>;
+    findByEventId<T extends Prisma.LightningTalkInclude>(eventId: string, include?: T): Promise<Prisma.LightningTalkGetPayload<{
+        include: AllInclude;
+    }>[]>;
+    findMany(args?: Omit<Prisma.LightningTalkFindManyArgs, "include">): Promise<Prisma.LightningTalkGetPayload<{
+        include: DefaultInclude;
+    }>[]>;
 }
+export {};

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

@@ -1,26 +1,38 @@
-import type { Exhibit, LightningTalk, Prisma, PrismaClient } from "@prisma/client";
+import type { Prisma, PrismaClient } from "@prisma/client";
 import { BaseRepository } from "./base.repository";
 import type { ILightningTalkRepository } from "./interfaces/lightningTalk.repository.interface";
-export declare class LightningTalkRepository extends BaseRepository<LightningTalk & {
-    exhibit: Exhibit;
-}, Prisma.LightningTalkCreateInput, Prisma.LightningTalkUpdateInput, Prisma.LightningTalkFindManyArgs> implements ILightningTalkRepository {
+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 {
     constructor(prisma: PrismaClient);
-    create(data: Prisma.LightningTalkCreateInput): Promise<LightningTalk & {
-        exhibit: Exhibit;
-    }>;
-    update(id: string, data: Prisma.LightningTalkUpdateInput): Promise<LightningTalk & {
-        exhibit: Exhibit;
-    }>;
-    delete(id: string): Promise<LightningTalk & {
-        exhibit: Exhibit;
-    }>;
-    findById(id: string): Promise<(LightningTalk & {
-        exhibit: Exhibit;
-    }) | null>;
-    findByEventId(eventId: string): Promise<(LightningTalk & {
-        exhibit: Exhibit;
-    })[]>;
-    findMany(args?: Prisma.LightningTalkFindManyArgs): Promise<(LightningTalk & {
-        exhibit: Exhibit;
-    })[]>;
+    create(data: Prisma.LightningTalkCreateInput): Promise<Prisma.LightningTalkGetPayload<{
+        include: DefaultInclude;
+    }>>;
+    update(id: string, data: Prisma.LightningTalkUpdateInput): Promise<Prisma.LightningTalkGetPayload<{
+        include: DefaultInclude;
+    }>>;
+    delete(id: string): Promise<Prisma.LightningTalkGetPayload<{
+        include: DefaultInclude;
+    }>>;
+    findById(id: string, include?: Prisma.LightningTalkInclude): Promise<Prisma.LightningTalkGetPayload<{
+        include: AllInclude;
+    }> | null>;
+    findByEventId(eventId: string, include?: Prisma.LightningTalkInclude): Promise<Prisma.LightningTalkGetPayload<{
+        include: AllInclude;
+    }>[]>;
+    findMany(args?: Omit<Prisma.LightningTalkFindManyArgs, "include">): Promise<Prisma.LightningTalkGetPayload<{
+        include: DefaultInclude;
+    }>[]>;
 }
+export {};

package/dist/repositories/lightningTalk.repository.js

@@ -25,23 +25,20 @@ class LightningTalkRepository extends base_repository_1.BaseRepository {
             include: { exhibit: true },
         });
     }
-    async findById(id) {
+    async findById(id, include) {
         return this.prisma.lightningTalk.findUnique({
             where: { exhibitId: id },
             include: {
                 exhibit: {
                     include: {
-                        members: {
-                            include: {
-                                member: true,
-                            },
-                        },
+                        event: true,
+                        members: true,
                     },
                 },
             },
         });
     }
-    async findByEventId(eventId) {
+    async findByEventId(eventId, include) {
         return this.prisma.lightningTalk.findMany({
             where: {
                 exhibit: {
@@ -51,11 +48,8 @@ class LightningTalkRepository extends base_repository_1.BaseRepository {
             include: {
                 exhibit: {
                     include: {
-                        members: {
-                            include: {
-                                member: true,
-                            },
-                        },
+                        event: true,
+                        members: true,
                     },
                 },
             },
@@ -64,7 +58,7 @@ class LightningTalkRepository extends base_repository_1.BaseRepository {
     async findMany(args) {
         return this.prisma.lightningTalk.findMany({
             ...args,
-            include: { ...args === null || args === void 0 ? void 0 : args.include, exhibit: true },
+            include: { exhibit: true },
         });
     }
 }

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

@@ -8,15 +8,17 @@ class LightningTalkService extends base_service_1.BaseService {
         this.exhibitRepository = exhibitRepository;
     }
     async findById(id) {
-        return this.repository.findById(id);
+        return this.repository.findById(id, {
+            exhibit: {
+                include: { members: true, event: true },
+            },
+        });
     }
     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");
@@ -29,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");
@@ -41,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");
@@ -52,7 +52,11 @@ class LightningTalkService extends base_service_1.BaseService {
         return this.repository.findMany();
     }
     async findByEventId(eventId) {
-        return this.repository.findByEventId(eventId);
+        return this.repository.findByEventId(eventId, {
+            exhibit: {
+                include: { members: true, event: true },
+            },
+        });
     }
 }
 exports.LightningTalkService = LightningTalkService;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shizuoka-its/core",
-  "version": "0.3.1",
+  "version": "0.3.2-alpha.1",
   "description": "ITS core library",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -11,7 +11,10 @@
   "publishConfig": {
     "access": "public"
   },
-  "files": ["dist", "prisma"],
+  "files": [
+    "dist",
+    "prisma"
+  ],
   "scripts": {
     "postinstall": "prisma generate",
     "build": "tsc",
@@ -38,5 +41,6 @@
   },
   "dependencies": {
     "@prisma/client": "^5.22.0"
-  }
+  },
+  "packageManager": "yarn@1.22.22+sha1.ac34549e6aa8e7ead463a7407e1c7390f61a6610"
 }