Merge branch 'net-dav' into develop

src/controllers/ProfileInformationController.ts

@@ -69,7 +69,14 @@ export class ProfileInformationController extends Controller {
     ],
   })
   public async detailProfileInformation(@Path() profileId: string) {
-    const getProfileInformation = await this.profileInformationRepo.findBy({ profileId });
+    const getProfileInformation = await this.profileInformationRepo.findOne({
+      relations: {
+        bloodGroup: true,
+        relationship: true,
+        gender: true,
+      },
+      where: { profileId },
+    });
     if (!getProfileInformation) {
       throw new HttpError(HttpStatus.NOT_FOUND, "ไม่พบข้อมูล");
     }
@@ -106,8 +113,15 @@ export class ProfileInformationController extends Controller {
     ],
   })
   public async getProfileInformationHistory(@Path() informationId: string) {
-    const record = await this.profileInformationHistoryRepo.findBy({
+    const record = await this.profileInformationHistoryRepo.find({
-      profileInformationId: informationId,
+      relations: {
+        bloodGroup: true,
+        relationship: true,
+        gender: true,
+      },
+      where: {
+        profileInformationId: informationId,
+      },
     });
     if (!record) {
       throw new HttpError(HttpStatus.NOT_FOUND, "ไม่พบข้อมูล");