added

src/app/pages/memorial-list/memorial-list.ts

@@ -1,4 +1,4 @@
-import { Component } from '@angular/core';
+import { Component, OnInit } from '@angular/core';
 import { ActivatedRoute, Router, RouterLink } from '@angular/router';
 import { Memorial } from '../../models/memorial';
 import { DankaService } from '../../services/dankaService';
@@ -13,7 +13,7 @@ import { FormsModule } from '@angular/forms';
   templateUrl: './memorial-list.html',
   styleUrl: './memorial-list.scss',
 })
-export class MemorialList {
+export class MemorialList implements OnInit{
   memorialList: Memorial[] = [];
   targetYear: number = new Date().getFullYear();
   selectedMemorialType = 'all';
@@ -46,23 +46,37 @@ export class MemorialList {
     private dankaService: DankaService,
     private kakochoService: KakochoService,
   ) {
-    this.createMemorialList();
+
+  }
+  ngOnInit(): void {
+    this.init();
+  }
+
+  async init(): Promise<void> {
+    await this.createMemorialList();
   }
 
-  createMemorialList(): void {
+  async createMemorialList(): Promise<void> {
     this.memorialList = [];
-    const kakochoList = this.kakochoService.getKakochoList();
-    kakochoList.forEach((kakocho) => {
+
+    const kakochoList = await this.kakochoService.getKakochoList();
+
+    for (const kakocho of kakochoList) {
       const deathYear = Number(kakocho.deathDate.slice(0, 4));
       const yearDiff = this.targetYear - deathYear;
+
       const memorialType = this.getMemorialType(yearDiff);
-      if (memorialType === '') {
-        return;
-      }
-      if (this.selectedMemorialType !== 'all' && this.selectedMemorialType !== memorialType) {
-        return;
+      if (memorialType === '') continue;
+
+      if (
+        this.selectedMemorialType !== 'all' &&
+        this.selectedMemorialType !== memorialType
+      ) {
+        continue;
       }
-      const danka = this.dankaService.getDankaById(kakocho.dankaId);
+
+      const danka = await this.dankaService.getDankaById(kakocho.dankaId);
+
       const memorialTarget: Memorial = {
         id: kakocho.id,
         dankaId: kakocho.dankaId,
@@ -71,17 +85,21 @@ export class MemorialList {
         relationship: kakocho.relationship,
         householdName: danka?.householdName ?? '不明',
         deathDate: kakocho.deathDate,
-        memorialType: memorialType,
+        memorialType,
         note: kakocho.note,
       };
+
       this.memorialList.push(memorialTarget);
-    });
+    }
+
     this.memorialList.sort((a, b) => {
       const deathDateA = new Date(a.deathDate).getTime();
       const deathDateB = new Date(b.deathDate).getTime();
+
       if (deathDateA !== deathDateB) {
         return deathDateA - deathDateB;
       }
+
       return a.name.localeCompare(b.name, 'ja');
     });
   }

src/app/pages/search/search.ts

@@ -1,4 +1,4 @@
-import { Component } from '@angular/core';
+import { Component, OnInit } from '@angular/core';
 import { FormBuilder, FormsModule } from '@angular/forms';
 import { Router, RouterLink } from '@angular/router';
 import { Danka } from '../../models/danka';
@@ -16,7 +16,7 @@ import { AppSideMenu } from '../../share/side-menu/app-side-menu';
   templateUrl: './search.html',
   styleUrl: './search.scss',
 })
-export class Search {
+export class Search implements OnInit{
   searchKeyword = '';
   selectedSearchType = 'all';
   searchTypeFilters = [
@@ -34,7 +34,10 @@ export class Search {
     private dankaService: DankaService,
     private familyService: FamilyService,
     private kakochoService: KakochoService,
-  ) {}
+  ) { }
+
+  ngOnInit(): void {
+  }
 
   //　フィルタータブの選択処理
   changeSearchType(searchType: string): void {
@@ -43,57 +46,65 @@ export class Search {
   }
 
   //　全検索の処理
-  searchAll() {
+  async searchAll(): Promise<void> {
     const keyword = this.searchKeyword.trim();
+
     this.dankaResults = [];
     this.familyResults = [];
     this.kakochoResults = [];
     this.totalResultCount = 0;
-    if (keyword === '') {
-      return;
-    }
-    // 檀家・家族・過去帳の情報を取得
-    const dankaList = this.dankaService.getDankaList();
-    const familyList = this.familyService.getFamilyList();
-    const kakochoList = this.kakochoService.getKakochoList();
-    //檀家のキーワード検索
+
+    if (keyword === '') return;
+
+    const [dankaList, familyList, kakochoList] = await Promise.all([
+      this.dankaService.getDankaList(),
+      this.familyService.getFamilyList(),
+      this.kakochoService.getKakochoList(),
+    ]);
+
+    // 檀家検索
     if (this.selectedSearchType === 'all' || this.selectedSearchType === 'danka') {
-      this.dankaResults = dankaList.filter(
-        (danka) =>
-          danka.householdName.includes(keyword) ||
-          danka.householder.includes(keyword) ||
-          danka.postalCode.includes(keyword) ||
-          danka.address.includes(keyword) ||
-          danka.phones.some((phone) => phone.tel.includes(keyword) || phone.note.includes(keyword)),
+      this.dankaResults = dankaList.filter((danka) =>
+        danka.householdName.includes(keyword) ||
+        danka.householder.includes(keyword) ||
+        danka.postalCode.includes(keyword) ||
+        danka.address.includes(keyword) ||
+        danka.phones.some(
+          (phone) =>
+            phone.tel.includes(keyword) ||
+            phone.note.includes(keyword)
+        )
       );
     }
-    //家族のキーワード検索
+
+    // 家族検索
     if (this.selectedSearchType === 'all' || this.selectedSearchType === 'family') {
-      this.familyResults = familyList.filter(
-        (family) =>
-          family.name.includes(keyword) ||
-          family.furigana.includes(keyword) ||
-          family.relationship.includes(keyword) ||
-          family.birthDate.includes(keyword) ||
-          family.note.includes(keyword),
+      this.familyResults = familyList.filter((family) =>
+        family.name.includes(keyword) ||
+        family.furigana.includes(keyword) ||
+        family.relationship.includes(keyword) ||
+        family.birthDate.includes(keyword) ||
+        family.note.includes(keyword)
       );
     }
-    //過去帳のキーワード検索
+
+    // 過去帳検索
     if (this.selectedSearchType === 'all' || this.selectedSearchType === 'kakocho') {
-      this.kakochoResults = kakochoList.filter(
-        (kakocho) =>
-          kakocho.name.includes(keyword) ||
-          kakocho.furigana.includes(keyword) ||
-          kakocho.relationship.includes(keyword) ||
-          kakocho.kaimyo.includes(keyword) ||
-          kakocho.deathDate.includes(keyword) ||
-          kakocho.ageAtDeath.includes(keyword) ||
-          kakocho.note.includes(keyword),
+      this.kakochoResults = kakochoList.filter((kakocho) =>
+        kakocho.name.includes(keyword) ||
+        kakocho.furigana.includes(keyword) ||
+        kakocho.relationship.includes(keyword) ||
+        kakocho.kaimyo.includes(keyword) ||
+        kakocho.deathDate.includes(keyword) ||
+        kakocho.ageAtDeath.includes(keyword) ||
+        kakocho.note.includes(keyword)
       );
     }
-    //検索結果の件数カウント
+
     this.totalResultCount =
-      this.dankaResults.length + this.familyResults.length + this.kakochoResults.length;
+      this.dankaResults.length +
+      this.familyResults.length +
+      this.kakochoResults.length;
   }
 
   clearSearch(): void {