added

src/app/pages/dashboard/dashboard.ts

@@ -104,21 +104,20 @@ export class Dashboard {
     const today = this.toDateOnly(new Date());
     const endDate = this.addDays(today, 30);
 
-    this.upcomingMemorials = (await this.kakochoService
-      .getKakochoList())
-      .map((kakocho): 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 = this.dankaService.getDankaById(kakocho.dankaId);
+
+        const danka = await this.dankaService.getDankaById(kakocho.dankaId);
+
         const type = memorialType ? '年忌法要' : '命日';
         const status = memorialType ? '準備確認' : '要確認';
 
@@ -133,8 +132,14 @@ export class Dashboard {
           status,
         };
       })
+    );
+
+    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'))
+      .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

@@ -163,7 +163,7 @@ export class FamilyEdit implements OnInit {
     );
   }
 
-  saveFamily() {
+  async saveFamily() {
     if (this.familyForm.invalid) {
       return;
     }
@@ -190,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,
@@ -207,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);
       }