Merge pull request #173 from ChubachiPT2024/feature/home-api

インポートページでの再開する用のAPI

src/@types/interface.d.ts

@@ -21,6 +21,8 @@ export interface IElectronAPI {
     reportListExportCommand: ReportListExportCommand
   ) => Promise<ReportListExportResult>
 
+  getReportCourseAsync: () => Promise<ReportCourseGetResult>
+
   getReportListAsync: (
     reportListGetCommand: ReportListGetCommand
   ) => Promise<ReportListGetResult>

src/application/reportCourse/reportCourseApplicationService.test.ts

@@ -0,0 +1,35 @@
+import { describe, expect, test } from 'vitest'
+import { InMemoryCourseRepository } from 'src/infrastructure/inMemory/courses/inMemoryCourseRepository'
+import { InMemoryReportRepository } from 'src/infrastructure/inMemory/reports/inMemoryReportRepository'
+import { ReportCourseApplicationService } from './reportCourseApplicationService'
+import { Course } from 'src/domain/models/courses/course'
+import { Report } from 'src/domain/models/reports/report'
+
+describe('get', () => {
+  test('Can get report course', async () => {
+    const courseRepository = new InMemoryCourseRepository()
+    const reportRepository = new InMemoryReportRepository()
+    const service = new ReportCourseApplicationService(
+      courseRepository,
+      reportRepository
+    )
+    const course = new Course(27048, 'コミュニケーション技術特論2')
+    await courseRepository.saveAsync(course)
+    const report = new Report(
+      course.id,
+      35677,
+      '個人レポート課題',
+      'folderAbsolutePath'
+    )
+    await reportRepository.saveAsync(report)
+
+    const getResult = await service.getReportCourseAsync()
+
+    const data = getResult.reportCourseDataList
+    expect(data.length).toBe(1)
+    expect(data[0].courseId).toBe(27048)
+    expect(data[0].courseName).toBe('コミュニケーション技術特論2')
+    expect(data[0].reportId).toBe(35677)
+    expect(data[0].reportTitle).toBe('個人レポート課題')
+  })
+})

src/application/reportCourse/reportCourseApplicationService.ts

@@ -0,0 +1,40 @@
+import { ReportRepository } from 'src/domain/models/reports/reportRepository'
+import { CourseRepository } from 'src/domain/models/courses/courseRepository'
+import { ReportCourseData } from './reportCourseData'
+import { ReportCourseGetResult } from './reportCourseGetResult'
+
+/**
+ * レポートコースアプリケーションサービス
+ */
+export class ReportCourseApplicationService {
+  /**
+   * コンストラクタ
+   *
+   * @param courseRepository コースリポジトリ
+   * @param reportRepository レポートリポジトリ
+   */
+  public constructor(
+    private readonly courseRepository: CourseRepository,
+    private readonly reportRepository: ReportRepository
+  ) {}
+
+  /**
+   * レポートとコースのデータを取得する
+   *
+   * @returns レポートとコースのデータ
+   */
+  public async getReportCourseAsync(): Promise<ReportCourseGetResult> {
+    const reports = await this.reportRepository.findAllAsync()
+    const courses = await this.courseRepository.findAllAsync()
+
+    const reportCourseDataList: ReportCourseData[] = []
+    for (const report of reports) {
+      const course = courses.find((course) => course.id === report.courseId)
+      reportCourseDataList.push(
+        new ReportCourseData(course.id, course.name, report.id, report.title)
+      )
+    }
+
+    return new ReportCourseGetResult(reportCourseDataList)
+  }
+}

src/application/reportCourse/reportCourseData.ts

@@ -0,0 +1,19 @@
+/**
+ * レポートとコースのデータ
+ */
+export class ReportCourseData {
+  /**
+   * コンストラクタ
+   *
+   * @param courseId コース ID
+   * @param courseName コース名
+   * @param reportId レポート ID
+   * @param reportTitle レポートタイトル
+   */
+  public constructor(
+    public readonly courseId: number,
+    public readonly courseName: string,
+    public readonly reportId: number,
+    public readonly reportTitle: string
+  ) {}
+}

src/application/reportCourse/reportCourseGetResult.ts

@@ -0,0 +1,15 @@
+import { ReportCourseData } from './reportCourseData'
+
+/**
+ * レポートとコース取得結果
+ */
+export class ReportCourseGetResult {
+  /**
+   * コンストラクタ
+   *
+   * @param reportListData レポートコースデータ
+   */
+  public constructor(
+    public readonly reportCourseDataList: ReportCourseData[]
+  ) {}
+}

src/domain/models/courses/courseRepository.ts

@@ -17,4 +17,10 @@ export interface CourseRepository {
    * @param id ID
    */
   findAsync(id: number): Promise<Course>
+
+  /**
+   * コースを全件取得する
+   *
+   */
+  findAllAsync(): Promise<Course[]>
 }

src/domain/models/reports/reportRepository.ts

@@ -17,4 +17,10 @@ export interface ReportRepository {
    * @param id ID
    */
   findAsync(id: number): Promise<Report>
+
+  /**
+   * レポートを全件取得する
+   *
+   */
+  findAllAsync(): Promise<Report[]>
 }

src/infrastructure/inMemory/courses/inMemoryCourseRepository.test.ts

@@ -13,4 +13,16 @@ describe('save', () => {
     expect(actual.id).toBe(expected.id)
     expect(actual.name).toBe(expected.name)
   })
+
+  test('should return all courses', async () => {
+    const repository = new InMemoryCourseRepository()
+    const expected1 = new Course(1, 'name')
+    const expected2 = new Course(2, 'name')
+
+    await repository.saveAsync(expected1)
+    await repository.saveAsync(expected2)
+
+    const actual = await repository.findAllAsync()
+    expect(actual.length).toBe(2)
+  })
 })

src/infrastructure/inMemory/courses/inMemoryCourseRepository.ts

@@ -32,4 +32,13 @@ export class InMemoryCourseRepository implements CourseRepository {
     }
     return course
   }
+
+  /**
+   * コースを全件取得する
+   *
+   * @returns コース
+   */
+  public async findAllAsync(): Promise<Course[]> {
+    return Array.from(this.courses.values())
+  }
 }

src/infrastructure/inMemory/reports/inMemoryReportRepository.test.ts

@@ -17,4 +17,26 @@ describe('save', () => {
       expected.reportListFolderAbsolutePath
     )
   })
+
+  test('should return all reports', async () => {
+    const repository = new InMemoryReportRepository()
+    const expected1 = new Report(
+      1,
+      1,
+      'title1',
+      'reportListFolderAbsolutePath1'
+    )
+    const expected2 = new Report(
+      2,
+      2,
+      'title2',
+      'reportListFolderAbsolutePath2'
+    )
+
+    await repository.saveAsync(expected1)
+    await repository.saveAsync(expected2)
+
+    const actual = await repository.findAllAsync()
+    expect(actual.length).toBe(2)
+  })
 })

src/infrastructure/inMemory/reports/inMemoryReportRepository.ts

@@ -32,4 +32,13 @@ export class InMemoryReportRepository implements ReportRepository {
     }
     return report
   }
+
+  /**
+   * レポートを全件取得する
+   *
+   * @returns レポート
+   */
+  public async findAllAsync(): Promise<Report[]> {
+    return Array.from(this.reports.values())
+  }
 }

src/main.ts

@@ -18,6 +18,7 @@ import { SubmissionSummariesGetCommand } from './application/submissionSummaries
 import { SubmissionFileApplicationService } from './application/submissionFiles/submissionFileApplicationService'
 import { SubmissionFileGetCommand } from './application/submissionFiles/submissionFileGetCommand'
 import { ReportListExportCommand } from './application/reportLists/reportListExportCommand'
+import { ReportCourseApplicationService } from './application/reportCourse/reportCourseApplicationService'
 
 // Handle creating/removing shortcuts on Windows when installing/uninstalling.
 if (require('electron-squirrel-startup')) {
@@ -75,6 +76,10 @@ const submissionFileApplicationService = new SubmissionFileApplicationService(
   reportRepository,
   submissionRepository
 )
+const reportCourseApplicationService = new ReportCourseApplicationService(
+  courseRepository,
+  reportRepository
+)
 
 // This method will be called when Electron has finished
 // initialization and is ready to create browser windows.
@@ -92,6 +97,11 @@ app.whenReady().then(() => {
       await reportListApplicationService.exportAsync(reportListExportCommand)
   )
 
+  ipcMain.handle(
+    'getReportCourseAsync',
+    async () => await reportCourseApplicationService.getReportCourseAsync()
+  )
+
   ipcMain.handle(
     'getReportListAsync',
     async (_, reportListGetCommand: ReportListGetCommand) =>

src/preload.ts

@@ -19,6 +19,8 @@ contextBridge.exposeInMainWorld('electronAPI', {
   exportReportListAsync: (reportListExportCommand: ReportListExportCommand) =>
     ipcRenderer.invoke('exportReportListAsync', reportListExportCommand),
 
+  getReportCourseAsync: () => ipcRenderer.invoke('getReportCourseAsync'),
+
   getReportListAsync: (reportListGetCommand: ReportListGetCommand) =>
     ipcRenderer.invoke('getReportListAsync', reportListGetCommand),