From a9826808c448bea59deefc253fb78a83697761ef Mon Sep 17 00:00:00 2001
From: jyj1289 <jin37091289@gmail.com>
Date: Fri, 11 Oct 2024 14:57:30 +0900
Subject: [PATCH 1/3] =?UTF-8?q?perf(#152):=20=EC=A0=91=EC=88=98=EC=A6=9D?=
 =?UTF-8?q?=20=EC=96=91=EC=8B=9D=20=EB=B3=80=EA=B2=BD=20-=20=EC=A0=91?=
 =?UTF-8?q?=EC=88=98=EC=A6=9D=EC=97=90=20=EB=8C=80=EC=83=81=EA=B5=AC?=
 =?UTF-8?q?=EB=B6=84=EC=9D=84=20=EC=B6=94=EA=B0=80=ED=95=98=EA=B3=A0=20?=
 =?UTF-8?q?=EC=A0=84=ED=98=95=EA=B5=AC=EB=B6=84=EC=9D=84=20=EB=A9=94?=
 =?UTF-8?q?=EC=9D=B8=EC=B9=B4=ED=85=8C=EA=B3=A0=EB=A6=AC=EB=A5=BC=20?=
 =?UTF-8?q?=ED=95=98=EB=8F=84=EB=A1=9D=20=EB=B3=80=EA=B2=BD=ED=96=88?=
 =?UTF-8?q?=EC=96=B4=EC=9A=94.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/templates/proof-of-application.html | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/templates/proof-of-application.html b/src/main/resources/templates/proof-of-application.html
index 7883a412..13e8cfa8 100644
--- a/src/main/resources/templates/proof-of-application.html
+++ b/src/main/resources/templates/proof-of-application.html
@@ -123,7 +123,7 @@
                 </td>
             </tr>
             <tr>
-                <td class="ba center" style="width: 33%" rowspan="5">
+                <td class="ba center" style="width: 33%" rowspan="6">
                     <img
                             th:src="${identificationPictureUri}"
                             alt="증명사진"/>
@@ -133,7 +133,11 @@
             </tr>
             <tr>
                 <th scope="row" class="ba">전형구분</th>
-                <td class="ba" th:text="${form.type.getCategory().description}"></td>
+                <td class="ba" th:text="${form.type.getMainCategory().description}"></td>
+            </tr>
+            <tr>
+                <th scope="row" class="ba">대상구분</th>
+                <td class="ba" th:text="${form.type.getDescription()}"></td>
             </tr>
             <tr>
                 <th scope="row" class="ba">생년월일</th>

From a266bda7d91f65950aeee94d08129304583ea745 Mon Sep 17 00:00:00 2001
From: jyj1289 <jin37091289@gmail.com>
Date: Sun, 13 Oct 2024 02:55:24 +0900
Subject: [PATCH 2/3] =?UTF-8?q?fix(#152):=20=EC=98=A4=ED=83=80=EC=88=98?=
 =?UTF-8?q?=EC=A0=95=20-=20FormController=20=EC=97=90=20generateProfOfAppl?=
 =?UTF-8?q?ication=20=EB=A9=94=EC=84=9C=EB=93=9C=20=EC=98=A4=ED=83=80?=
 =?UTF-8?q?=EB=A5=BC=20generateProofOfApplication=20=EB=A9=94=EC=84=9C?=
 =?UTF-8?q?=EB=93=9C=EB=A1=9C=20=EC=A0=80=EC=9E=A5=ED=96=88=EC=96=B4?=
 =?UTF-8?q?=EC=9A=94.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/bamdoliro/maru/presentation/form/FormController.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/com/bamdoliro/maru/presentation/form/FormController.java b/src/main/java/com/bamdoliro/maru/presentation/form/FormController.java
index 122f45c1..c648a96f 100644
--- a/src/main/java/com/bamdoliro/maru/presentation/form/FormController.java
+++ b/src/main/java/com/bamdoliro/maru/presentation/form/FormController.java
@@ -225,7 +225,7 @@ public ResponseEntity<Resource> generateAdmissionTicket(
     }
 
     @GetMapping("/proof-of-application")
-    public ResponseEntity<Resource> generateProfOfApplication(
+    public ResponseEntity<Resource> generateProofOfApplication(
             @AuthenticationPrincipal(authority = Authority.USER) User user
     ) {
         return ResponseEntity.ok()

From c2df8f6428cc8f734c22d02c332c780a2facbe24 Mon Sep 17 00:00:00 2001
From: jyj1289 <jin37091289@gmail.com>
Date: Sun, 13 Oct 2024 03:02:40 +0900
Subject: [PATCH 3/3] =?UTF-8?q?fix(#152):=20=EA=B5=AD=EA=B0=80=EB=B3=B4?=
 =?UTF-8?q?=ED=9B=88=EB=8C=80=EC=83=81=EC=9E=90=20=EC=A4=91=20=EA=B5=90?=
 =?UTF-8?q?=EC=9C=A1=EC=A7=80=EC=9B=90=EB=8C=80=EC=83=81=EC=9E=90=EB=85=80?=
 =?UTF-8?q?=20=EC=A0=84=ED=98=95=EC=8B=9C=20=EA=B0=92=20=EB=B3=80=EA=B2=BD?=
 =?UTF-8?q?=20-=20=EA=B5=AD=EA=B0=80=EB=B3=B4=ED=9B=88=EB=8C=80=EC=83=81?=
 =?UTF-8?q?=EC=9E=90=20=EC=A4=91=20=EA=B5=90=EC=9C=A1=EC=A7=80=EC=9B=90?=
 =?UTF-8?q?=EB=8C=80=EC=83=81=EC=9E=90=EB=85=80=20=EC=A0=84=ED=98=95?=
 =?UTF-8?q?=EC=9D=BC=20=EB=95=8C=20=EC=B9=B8=EC=9D=B4=20=EA=B9=A8=EC=A7=80?=
 =?UTF-8?q?=EB=8A=94=20=EA=B2=83=EC=9D=84=20=EB=B0=A9=EC=A7=80=ED=95=98?=
 =?UTF-8?q?=EA=B8=B0=20=EC=9C=84=ED=95=B4=20'=EA=B5=AD=EA=B0=80=EB=B3=B4?=
 =?UTF-8?q?=ED=9B=88=EB=8C=80=EC=83=81=EC=9E=90'=EB=A1=9C=20=EA=B0=92?=
 =?UTF-8?q?=EC=9D=84=20=EB=B0=94=EA=BE=B8=EC=97=88=EC=96=B4=EC=9A=94.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/templates/proof-of-application.html | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/resources/templates/proof-of-application.html b/src/main/resources/templates/proof-of-application.html
index 13e8cfa8..4ea3ef82 100644
--- a/src/main/resources/templates/proof-of-application.html
+++ b/src/main/resources/templates/proof-of-application.html
@@ -137,7 +137,8 @@
             </tr>
             <tr>
                 <th scope="row" class="ba">대상구분</th>
-                <td class="ba" th:text="${form.type.getDescription()}"></td>
+                <td class="ba" th:unless="${form.type.isNationalVeteransEducation()}" th:text="${form.type.getDescription()}"></td>
+                <td class="ba" th:if="${form.type.isNationalVeteransEducation()}">국가보훈대상자</td>
             </tr>
             <tr>
                 <th scope="row" class="ba">생년월일</th>