Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/app/pages/dashboard/dashboard.ts

src/app/pages/danka-edit/danka-edit.ts

@@ -1,4 +1,4 @@
-import { Component, inject } from '@angular/core';
+import { Component, inject, OnInit } from '@angular/core';
 import {
   FormBuilder,
   FormGroup,
@@ -19,7 +19,7 @@ import { Danka } from '../../models/danka';
   templateUrl: './danka-edit.html',
   styleUrl: './danka-edit.scss',
 })
-export class DankaEdit {
+export class DankaEdit implements OnInit {
   danka: Danka | undefined;
 
   dankaForm = new FormGroup({
@@ -38,9 +38,17 @@ export class DankaEdit {
     private route: ActivatedRoute,
     private router: Router,
   ) {
+  }
+
+  ngOnInit(): void {
+    this.init();
+  }
+
+  async init(): Promise<void> {
     const id = this.route.snapshot.params['id'];
+
     if (id) {
-      this.danka = this.dankaService.getDankaById(id);
+      this.danka = await this.dankaService.getDankaById(id);
 
       if (this.danka) {
         this.dankaForm.patchValue({
@@ -60,7 +68,7 @@ export class DankaEdit {
         }
       }
     }
-    console.log(this.danka);
+
   }
 
   get phones() {
@@ -79,7 +87,7 @@ export class DankaEdit {
   }
 
   removePhone(index: number) {
-    if(this.phones.length > 1) {
+    if (this.phones.length > 1) {
       this.phones.removeAt(index);
     }
   }

src/app/pages/dashboard/dashboard.ts

@@ -1,6 +1,5 @@
 import { Component } from '@angular/core';
-import { Router, RouterLink } from '@angular/router';
-import { FormsModule } from '@angular/forms';
+import { RouterLink } from '@angular/router';
 import { KakochoService } from '../../services/kakocho-service';
 import { DankaService } from '../../services/dankaService';
 import { Danka } from '../../models/danka';
@@ -116,22 +115,20 @@ export class Dashboard {
     const today = this.toDateOnly(new Date());
     const endDate = this.addDays(today, 30);
 
-    const upcomingMemorials = await Promise.all(
-      (await this.kakochoService
-        .getKakochoList())
-        .map(async (kakocho): Promise<UpcomingMemorial | null> => {
+    const kakochoList = await this.kakochoService.getKakochoList();
+
+    const results = await Promise.all(
+      kakochoList.map(async (kakocho): Promise<UpcomingMemorial | null> => {
         const deathDate = this.parseDate(kakocho.deathDate);
-        if (!deathDate) {
-          return null;
-        }
+        if (!deathDate) return null;
 
         const eventDate = new Date(this.targetYear, deathDate.getMonth(), deathDate.getDate());
-        if (eventDate < today || eventDate > endDate) {
-          return null;
-        }
+        if (eventDate < today || eventDate > endDate) return null;
 
         const memorialType = this.getMemorialType(deathDate);
+
         const danka = await this.dankaService.getDankaById(kakocho.dankaId);
+
         const type = memorialType ? '年忌法要' : '命日';
         const status = memorialType ? '準備確認' : '要確認';
 
@@ -145,10 +142,10 @@ export class Dashboard {
           type,
           status,
         };
-      }),
+      })
     );
 
-    this.upcomingMemorials = upcomingMemorials
+    this.upcomingMemorials = results
       .filter((memorial): memorial is UpcomingMemorial => memorial !== null)
       .sort((a, b) => a.date.getTime() - b.date.getTime() || a.title.localeCompare(b.title, 'ja'))
       .slice(0, 3);

src/app/pages/family-edit/family-edit.ts

@@ -23,7 +23,7 @@ import { MarriageRelation } from '../../models/marriage-relation';
   templateUrl: './family-edit.html',
   styleUrl: './family-edit.scss',
 })
-export class FamilyEdit implements OnInit{
+export class FamilyEdit implements OnInit {
   danka: Danka | undefined;
   family: Family | undefined;
   families: Family[] = [];
@@ -135,14 +135,13 @@ export class FamilyEdit implements OnInit{
     return this.families.filter((family) => family.id !== this.familyId);
   }
 
-  patchMarriageRelationFields(familyId: string): void {
-    const relations = this.marriageRelationService.getMarriageRelationsByFamilyId(familyId);
+  async patchMarriageRelationFields(familyId: string): Promise<void> {
+    const relations = await this.marriageRelationService.getMarriageRelationsByFamilyId(familyId);
+
     const relation =
       relations.find((marriageRelation) => marriageRelation.status === 'current') ?? relations[0];
 
-    if (!relation) {
-      return;
-    }
+    if (!relation) return;
 
     this.familyForm.patchValue({
       spouseId: relation.person1Id === familyId ? relation.person2Id : relation.person1Id,
@@ -150,17 +149,21 @@ export class FamilyEdit implements OnInit{
     });
   }
 
-  findMarriageRelation(person1Id: string, person2Id: string): MarriageRelation | undefined {
-    return this.marriageRelationService
-      .getMarriageRelationsByFamilyId(person1Id)
-      .find(
-        (relation) =>
-          (relation.person1Id === person1Id && relation.person2Id === person2Id) ||
-          (relation.person1Id === person2Id && relation.person2Id === person1Id),
-      );
+  async findMarriageRelation(
+    person1Id: string,
+    person2Id: string
+  ): Promise<MarriageRelation | undefined> {
+
+    const relations = await this.marriageRelationService.getMarriageRelationsByFamilyId(person1Id);
+
+    return relations.find(
+      (relation) =>
+        (relation.person1Id === person1Id && relation.person2Id === person2Id) ||
+        (relation.person1Id === person2Id && relation.person2Id === person1Id),
+    );
   }
 
-  saveFamily() {
+  async saveFamily() {
     if (this.familyForm.invalid) {
       return;
     }
@@ -187,9 +190,10 @@ export class FamilyEdit implements OnInit{
     };
 
     if (spouseId) {
-      const existingRelation = this.findMarriageRelation(familyId, spouseId);
-      const errors = this.marriageRelationService.saveMarriageRelation({
-        id: existingRelation?.id ?? Date.now().toString(),
+      const existingRelation = await this.findMarriageRelation(familyId, spouseId);
+
+      const errors = await this.marriageRelationService.saveMarriageRelation({
+        id: existingRelation?.id ?? crypto.randomUUID(),
         dankaId,
         person1Id: familyId,
         person2Id: spouseId,
@@ -204,7 +208,7 @@ export class FamilyEdit implements OnInit{
         return;
       }
     } else {
-      const currentMarriage = this.marriageRelationService.getCurrentMarriageByFamilyId(familyId);
+      const currentMarriage = await this.marriageRelationService.getCurrentMarriageByFamilyId(familyId);
       if (currentMarriage) {
         this.marriageRelationService.deleteMarriageRelation(currentMarriage.id);
       }

src/app/pages/kakocho-edit/kakocho-edit.ts

@@ -37,7 +37,7 @@ export class KakochoEdit implements OnInit {
   kakocho?: Kakocho;
   sourceFamily?: Family;
   kakochoForm: FormGroup;
-  dankaId: string;
+  dankaId: string | undefined;
   returnTab: 'family' | 'kakocho' = 'kakocho';
 
   constructor(