From 844137418dc3a077db56102780f069789dcfd20e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=9E=A5=EB=8F=99=EA=B2=B8?= Date: Sun, 8 Jun 2025 15:24:32 +0900 Subject: [PATCH 1/2] =?UTF-8?q?=F0=9F=94=A8=20Fix=20-=20Lob=20=EC=96=B4?= =?UTF-8?q?=EB=85=B8=ED=85=8C=EC=9D=B4=EC=85=98=20=EB=B6=99=EC=9D=80=20?= =?UTF-8?q?=EC=BB=AC=EB=9F=BC=EB=93=A4=20=EC=86=8D=EC=84=B1=20TEXT?= =?UTF-8?q?=EB=A1=9C=20=EB=B3=80=EA=B2=BD=20(#323)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- http/career/CarrerControllerHttpRequest.http | 18 +++++++++--------- .../com/inglo/giggle/career/domain/Career.java | 2 +- .../giggle/career/domain/CareerImage.java | 2 +- .../giggle/posting/domain/CompanyImage.java | 2 +- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/http/career/CarrerControllerHttpRequest.http b/http/career/CarrerControllerHttpRequest.http index 6f78960f..258bb58a 100644 --- a/http/career/CarrerControllerHttpRequest.http +++ b/http/career/CarrerControllerHttpRequest.http @@ -1,6 +1,6 @@ ### 14.1 (게스트) 커리어 리스트 조회 //@no-log -GET http://localhost:8080/v1/guests/careers/overviews? +GET {{host_url}}/v1/guests/careers/overviews? page=1& size=10& sorting=TRENDING @@ -16,7 +16,7 @@ GET http://localhost:8080/v1/guests/careers/1/details ### 14.3 (유학생) 커리어 리스트 조회 //@no-log -GET http://localhost:8080/v1/users/careers/overviews? +GET {{host_url}}/v1/users/careers/overviews? page=1& size=10& is-book-marked=TRUE @@ -26,14 +26,14 @@ Authorization: Bearer {{access_token}} ### 14.4 (유학생) 커리어 디테일 조회 //@no-log -GET http://localhost:8080/v1/users/careers/1/details +GET {{host_url}}/v1/users/careers/1/details Content-Type: application/json Authorization: Bearer {{access_token}} ### 14.5 (어드민) 커리어 추가하기 //@no-log -POST http://localhost:8080/v1/admins/careers +POST {{host_url}}/v1/admins/careers Content-Type: multipart/form-data; boundary=boundary Authorization: Bearer {{access_token}} @@ -71,7 +71,7 @@ Content-Type: application/json ### 14.6 (유학생) 커리어 북마크 추가/삭제 -PUT http://localhost:8080/v1/users/careers/2/book-mark-careers +PUT {{host_url}}/v1/users/careers/2/book-mark-careers Content-Type: application/json Authorization: Bearer {{access_token}} @@ -79,7 +79,7 @@ Authorization: Bearer {{access_token}} ### 14.7 (어드민) 커리어 리스트 조회 //@no-log -GET http://localhost:8080/v1/admins/careers/overviews? +GET {{host_url}}/v1/admins/careers/overviews? page=1& size=10& sorting=TRENDING @@ -90,14 +90,14 @@ Authorization: Bearer {{access_token}} ### 14.8 (어드민) 커리어 디테일 조회 //@no-log -GET http://localhost:8080/v1/admins/careers/1/details +GET {{host_url}}/v1/admins/careers/1/details Content-Type: application/json Authorization: Bearer {{access_token}} ### 14.9 (어드민) 커리어 수정하기 //@no-log -PUT http://localhost:8080/v1/admins/careers/1 +PUT {{host_url}}/v1/admins/careers/1 Content-Type: multipart/form-data; boundary=boundary Authorization: Bearer {{access_token}} @@ -135,5 +135,5 @@ Content-Type: application/json ### 14.10 (어드민) 커리어 삭제하기 //@no-log -DELETE http://localhost:8080/v1/admins/careers/2 +DELETE {{host_url}}/v1/admins/careers/2 Authorization: Bearer {{access_token}} \ No newline at end of file diff --git a/src/main/java/com/inglo/giggle/career/domain/Career.java b/src/main/java/com/inglo/giggle/career/domain/Career.java index c070d489..3959d711 100644 --- a/src/main/java/com/inglo/giggle/career/domain/Career.java +++ b/src/main/java/com/inglo/giggle/career/domain/Career.java @@ -78,7 +78,7 @@ public class Career extends BaseEntity { private ECareerCategory category; @Lob - @Column(name = "details") + @Column(name = "details", columnDefinition = "TEXT") private String details; @Column(name = "application_url") diff --git a/src/main/java/com/inglo/giggle/career/domain/CareerImage.java b/src/main/java/com/inglo/giggle/career/domain/CareerImage.java index 7e3a75ff..da8899fa 100644 --- a/src/main/java/com/inglo/giggle/career/domain/CareerImage.java +++ b/src/main/java/com/inglo/giggle/career/domain/CareerImage.java @@ -30,7 +30,7 @@ public class CareerImage extends BaseEntity { /* Information Column ------------------------- */ /* -------------------------------------------- */ @Lob - @Column(name = "img_url", nullable = false) + @Column(name = "img_url", nullable = false, columnDefinition = "TEXT") private String imgUrl; @Column(name = "serial_id", nullable = false) diff --git a/src/main/java/com/inglo/giggle/posting/domain/CompanyImage.java b/src/main/java/com/inglo/giggle/posting/domain/CompanyImage.java index 1d070715..12fb35c8 100644 --- a/src/main/java/com/inglo/giggle/posting/domain/CompanyImage.java +++ b/src/main/java/com/inglo/giggle/posting/domain/CompanyImage.java @@ -37,7 +37,7 @@ public class CompanyImage extends BaseEntity { /* Information Column ------------------------- */ /* -------------------------------------------- */ @Lob - @Column(name = "img_url", nullable = false) + @Column(name = "img_url", nullable = false, columnDefinition = "TEXT") private String imgUrl; /* -------------------------------------------- */ From eea4e01c66249721f1c549aecb3a25a0880d6ee5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=9E=A5=EB=8F=99=EA=B2=B8?= Date: Mon, 9 Jun 2025 00:20:13 +0900 Subject: [PATCH 2/2] =?UTF-8?q?=F0=9F=94=A8=20Fix=20-=20ENationality,=20EM?= =?UTF-8?q?ajor=20fromString=EC=97=90=20=EB=A7=B5=ED=95=91=EB=90=98?= =?UTF-8?q?=EB=8A=94=20value=EA=B0=92=EC=9D=84=20Enum.name=EC=9C=BC?= =?UTF-8?q?=EB=A1=9C=20=EB=B3=80=EA=B2=BD=20(#325)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/inglo/giggle/core/type/EMajor.java | 33 +-- .../inglo/giggle/core/type/ENationality.java | 256 +----------------- 2 files changed, 14 insertions(+), 275 deletions(-) diff --git a/src/main/java/com/inglo/giggle/core/type/EMajor.java b/src/main/java/com/inglo/giggle/core/type/EMajor.java index 98afa7ff..74ff28c7 100644 --- a/src/main/java/com/inglo/giggle/core/type/EMajor.java +++ b/src/main/java/com/inglo/giggle/core/type/EMajor.java @@ -38,32 +38,11 @@ public enum EMajor { private final String enName; public static EMajor fromString(String value) { - return switch (value) { - case "Business Management" -> BUSINESS_MANAGEMENT; - case "Office & Accounting" -> OFFICE_ACCOUNTING; - case "Finance & Insurance" -> FINANCE_INSURANCE; - case "Education & Research" -> EDUCATION_RESEARCH; - case "Law & Public Safety" -> LAW_PUBLIC_SAFETY; - case "Healthcare" -> HEALTHCARE; - case "Social Work & Religion" -> SOCIAL_WORK_RELIGION; - case "Arts & Media" -> ARTS_MEDIA; - case "Driving & Delivery" -> DRIVING_DELIVERY; - case "Sales" -> SALES; - case "Security & Cleaning" -> SECURITY_CLEANING; - case "Hospitality & Leisure" -> HOSPITALITY_LEISURE; - case "Food Service" -> FOOD_SERVICE; - case "Construction" -> CONSTRUCTION; - case "Machinery" -> MACHINERY; - case "Materials" -> MATERIALS; - case "Chemistry & Bio" -> CHEMISTRY_BIO; - case "Textiles & Fashion" -> TEXTILES_FASHION; - case "Electronics" -> ELECTRONICS; - case "IT & Telecommunications" -> IT_TELECOMMUNICATIONS; - case "Food Processing" -> FOOD_PROCESSING; - case "Printing & Craft" -> PRINTING_CRAFT; - case "Environment & Safety" -> ENVIRONMENT_SAFETY; - case "Agriculture & Fisheries" -> AGRICULTURE_FISHERIES; - default -> throw new IllegalArgumentException("전공이 잘못되었습니다."); - }; + for (EMajor major : EMajor.values()) { + if (major.name().equalsIgnoreCase(value.toUpperCase())) { + return major; + } + } + throw new IllegalArgumentException("전공이 잘못되었습니다."); } } diff --git a/src/main/java/com/inglo/giggle/core/type/ENationality.java b/src/main/java/com/inglo/giggle/core/type/ENationality.java index 0c8caaff..096fc5fb 100644 --- a/src/main/java/com/inglo/giggle/core/type/ENationality.java +++ b/src/main/java/com/inglo/giggle/core/type/ENationality.java @@ -249,258 +249,18 @@ public enum ENationality { HEARD_AND_MCDONALD_ISLANDS("허드 맥도널드 제도", "Heard and McDonald Islands"), HUNGARY("헝가리", "Hungary"), HONG_KONG("홍콩", "Hong Kong"), - BLANK("없음", ""); - ; + BLANK("없음", "");; private final String krName; private final String enName; public static ENationality fromString(String value) { - return switch (value) { - case "Ghana" -> GHANA; - case "Gabon" -> GABON; - case "Guyana" -> GUYANA; - case "Gambia" -> GAMBIA; - case "Guatemala" -> GUATEMALA; - case "Guam" -> GUAM; - case "Grenada" -> GRENADA; - case "Greece" -> GREECE; - case "Greenland" -> GREENLAND; - case "Guinea" -> GUINEA; - case "Guinea-Bissau" -> GUINEA_BISSAU; - case "Namibia" -> NAMIBIA; - case "Nauru" -> NAURU; - case "Nigeria" -> NIGERIA; - case "Antarctica" -> ANTARCTICA; - case "Republic of South Sudan" -> REPUBLIC_OF_SOUTH_SUDAN; - case "South Africa" -> SOUTH_AFRICA; - case "Netherlands" -> NETHERLANDS; - case "Netherlands Antilles" -> NETHERLANDS_ANTILLES; - case "Nepal" -> NEPAL; - case "Norway" -> NORWAY; - case "Norfolk Island" -> NORFOLK_ISLAND; - case "New Caledonia" -> NEW_CALEDONIA; - case "New Zealand" -> NEW_ZEALAND; - case "Niue" -> NIUE; - case "Niger" -> NIGER; - case "Nicaragua" -> NICARAGUA; - case "Republic of Korea" -> REPUBLIC_OF_KOREA; - case "Denmark" -> DENMARK; - case "Dominican Republic" -> DOMINICAN_REPUBLIC; - case "Dominica" -> DOMINICA; - case "Germany" -> GERMANY; - case "East Timor" -> EAST_TIMOR; - case "Lao People's Democratic Republic" -> LAO_PEOPLES_DEMOCRATIC_REPUBLIC; - case "Liberia" -> LIBERIA; - case "Latvia" -> LATVIA; - case "Russian Federation" -> RUSSIAN_FEDERATION; - case "Lebanon" -> LEBANON; - case "Lesotho" -> LESOTHO; - case "Reunion" -> REUNION; - case "Romania" -> ROMANIA; - case "Luxembourg" -> LUXEMBOURG; - case "Rwanda" -> RWANDA; - case "Libyan Arab Jamahiriya" -> LIBYAN_ARAB_JAMAHIRIYA; - case "Lithuania" -> LITHUANIA; - case "Liechtenstein" -> LIECHTENSTEIN; - case "Madagascar" -> MADAGASCAR; - case "Martinique" -> MARTINIQUE; - case "Marshall Islands" -> MARSHALL_ISLANDS; - case "Mayotte" -> MAYOTTE; - case "Macau" -> MACAU; - case "Republic of Macedonia" -> REPUBLIC_OF_MACEDONIA; - case "Malawi" -> MALAWI; - case "Malaysia" -> MALAYSIA; - case "Mali" -> MALI; - case "Isle of Man" -> ISLE_OF_MAN; - case "Mexico" -> MEXICO; - case "Monaco" -> MONACO; - case "Morocco" -> MOROCCO; - case "Mauritius" -> MAURITIUS; - case "Mauritania" -> MAURITANIA; - case "Mozambique" -> MOZAMBIQUE; - case "Montenegro" -> MONTENEGRO; - case "Montserrat" -> MONTSERRAT; - case "Moldova, Republic of" -> MOLDOVA_REPUBLIC_OF; - case "Maldives" -> MALDIVES; - case "Malta" -> MALTA; - case "Mongolia" -> MONGOLIA; - case "United States" -> UNITED_STATES; - case "United States Minor Outlying Islands" -> UNITED_STATES_MINOR_OUTLYING_ISLANDS; - case "Virgin Islands, U.S." -> VIRGIN_ISLANDS_US; - case "Myanmar" -> MYANMAR; - case "Micronesia" -> MICRONESIA; - case "Vanuatu" -> VANUATU; - case "Bahrain" -> BAHRAIN; - case "Barbados" -> BARBADOS; - case "Vatican City State" -> VATICAN_CITY_STATE; - case "Bahamas" -> BAHAMAS; - case "Bangladesh" -> BANGLADESH; - case "Bermuda" -> BERMUDA; - case "Benin" -> BENIN; - case "Venezuela" -> VENEZUELA; - case "Viet Nam" -> VIET_NAM; - case "Belgium" -> BELGIUM; - case "Belarus" -> BELARUS; - case "Belize" -> BELIZE; - case "Bosnia Herzegovina" -> BOSNIA_HERZEGOVINA; - case "Botswana" -> BOTSWANA; - case "Bolivia" -> BOLIVIA; - case "Burundi" -> BURUNDI; - case "Burkina Faso" -> BURKINA_FASO; - case "Bouvet Island" -> BOUVET_ISLAND; - case "Bhutan" -> BHUTAN; - case "Northern Mariana Islands" -> NORTHERN_MARIANA_ISLANDS; - case "Bulgaria" -> BULGARIA; - case "Brazil" -> BRAZIL; - case "Brunei Darussalam" -> BRUNEI_DARUSSALAM; - case "Samoa" -> SAMOA; - case "Saudi Arabia" -> SAUDI_ARABIA; - case "South Georgia and the South Sandwich Islands" -> SOUTH_GEORGIA_AND_THE_SOUTH_SANDWICH_ISLANDS; - case "San Marino" -> SAN_MARINO; - case "Sao Tome and Principe" -> SAO_TOME_AND_PRINCIPE; - case "St. Pierre and Miquelon" -> ST_PIERRE_AND_MIQUELON; - case "Western Sahara" -> WESTERN_SAHARA; - case "Senegal" -> SENEGAL; - case "Serbia" -> SERBIA; - case "Seychelles" -> SEYCHELLES; - case "Saint Lucia" -> SAINT_LUCIA; - case "Saint Vincent and the Grenadines" -> SAINT_VINCENT_AND_THE_GRENADINES; - case "Saint Kitts and Nevis" -> SAINT_KITTS_AND_NEVIS; - case "St. Helena" -> ST_HELENA; - case "Somalia" -> SOMALIA; - case "Solomon Islands" -> SOLOMON_ISLANDS; - case "Sudan" -> SUDAN; - case "Suriname" -> SURINAME; - case "Sri Lanka" -> SRI_LANKA; - case "Svalbard and Jan Mayen Islands" -> SVALBARD_AND_JAN_MAYEN_ISLANDS; - case "Swaziland" -> SWAZILAND; - case "Sweden" -> SWEDEN; - case "Switzerland" -> SWITZERLAND; - case "Spain" -> SPAIN; - case "Slovakia" -> SLOVAKIA; - case "Slovenia" -> SLOVENIA; - case "Syrian Arab Republic" -> SYRIAN_ARAB_REPUBLIC; - case "Sierra Leone" -> SIERRA_LEONE; - case "Singapore" -> SINGAPORE; - case "United Arab Emirates" -> UNITED_ARAB_EMIRATES; - case "Aruba" -> ARUBA; - case "Armenia" -> ARMENIA; - case "Argentina" -> ARGENTINA; - case "American Samoa" -> AMERICAN_SAMOA; - case "Iceland" -> ICELAND; - case "Haiti" -> HAITI; - case "Ireland" -> IRELAND; - case "Azerbaijan" -> AZERBAIJAN; - case "Afghanistan" -> AFGHANISTAN; - case "Andorra" -> ANDORRA; - case "Albania" -> ALBANIA; - case "Algeria" -> ALGERIA; - case "Angola" -> ANGOLA; - case "Antigua and Barbuda" -> ANTIGUA_AND_BARBUDA; - case "Anguilla" -> ANGUILLA; - case "Eritrea" -> ERITREA; - case "Estonia" -> ESTONIA; - case "Ecuador" -> ECUADOR; - case "Ethiopia" -> ETHIOPIA; - case "El Salvador" -> EL_SALVADOR; - case "United Kingdom" -> UNITED_KINGDOM; - case "Virgin Islands, British" -> VIRGIN_ISLANDS_BRITISH; - case "British Indian Ocean Territory" -> BRITISH_INDIAN_OCEAN_TERRITORY; - case "Yemen" -> YEMEN_REPUBLIC_OF; - case "Oman" -> OMAN; - case "Australia" -> AUSTRALIA; - case "Austria" -> AUSTRIA; - case "Honduras" -> HONDURAS; - case "Aland Islands" -> ALAND_ISLANDS; - case "Wallis and Futuna Islands" -> WALLIS_AND_FUTUNA_ISLANDS; - case "Jordan" -> JORDAN; - case "Uganda" -> UGANDA; - case "Uruguay" -> URUGUAY; - case "Uzbekistan" -> UZBEKISTAN; - case "Ukraine" -> UKRAINE; - case "Iraq" -> IRAQ; - case "Iran" -> IRAN; - case "Israel" -> ISRAEL; - case "Egypt" -> EGYPT; - case "Italy" -> ITALY; - case "India" -> INDIA; - case "Indonesia" -> INDONESIA; - case "Japan" -> JAPAN; - case "Jamaica" -> JAMAICA; - case "Zambia" -> ZAMBIA; - case "Jersey" -> JERSEY; - case "Equatorial Guinea" -> EQUATORIAL_GUINEA; - case "Korea, Democratic People's Republic of" -> KOREA_DEMOCRATIC_PEOPLES_REPUBLIC_OF; - case "Georgia" -> GEORGIA; - case "Central African Republic" -> CENTRAL_AFRICAN_REPUBLIC; - case "Taiwan, Province of China" -> TAIWAN_PROVINCE_OF_CHINA; - case "China" -> CHINA; - case "Djibouti" -> DJIBOUTI; - case "Gibraltar" -> GIBRALTAR; - case "Zimbabwe" -> ZIMBABWE; - case "Chad" -> CHAD; - case "Czech Republic" -> CZECH_REPUBLIC; - case "Chile" -> CHILE; - case "Cameroon" -> CAMEROON; - case "Cape Verde" -> CAPE_VERDE; - case "Kazakhstan" -> KAZAKHSTAN; - case "Qatar" -> QATAR; - case "Cambodia" -> CAMBODIA; - case "Canada" -> CANADA; - case "Kenya" -> KENYA; - case "Cayman Islands" -> CAYMAN_ISLANDS; - case "Comoros" -> COMOROS; - case "Costa Rica" -> COSTA_RICA; - case "Cocos Islands" -> COCOS_ISLANDS; - case "Cote d'Ivoire" -> COTE_DIVOIRE; - case "Colombia" -> COLOMBIA; - case "Congo" -> CONGO; - case "Democratic Republic of the Congo" -> DEMOCRATIC_REPUBLIC_OF_THE_CONGO; - case "Cuba" -> CUBA; - case "Kuwait" -> KUWAIT; - case "Cook Islands" -> COOK_ISLANDS; - case "Croatia" -> CROATIA; - case "Christmas Island" -> CHRISTMAS_ISLAND; - case "Kyrgyzstan" -> KYRGYZSTAN; - case "Kiribati" -> KIRIBATI; - case "Cyprus" -> CYPRUS; - case "Thailand" -> THAILAND; - case "Tajikistan" -> TAJIKISTAN; - case "Tanzania, United Republic of" -> TANZANIA_UNITED_REPUBLIC_OF; - case "Turks and Caicos Islands" -> TURKS_AND_CAICOS_ISLANDS; - case "Turkey" -> TURKEY; - case "Togo" -> TOGO; - case "Tokelau" -> TOKELAU; - case "Tonga" -> TONGA; - case "Turkmenistan" -> TURKMENISTAN; - case "Tuvalu" -> TUVALU; - case "Tunisia" -> TUNISIA; - case "Trinidad and Tobago" -> TRINIDAD_AND_TOBAGO; - case "Panama" -> PANAMA; - case "Paraguay" -> PARAGUAY; - case "Pakistan" -> PAKISTAN; - case "Papua New Guinea" -> PAPUA_NEW_GUINEA; - case "Palau" -> PALAU; - case "Palestine" -> PALESTINE; - case "Faroe Islands" -> FAROE_ISLANDS; - case "Peru" -> PERU; - case "Portugal" -> PORTUGAL; - case "Falkland Islands" -> FALKLAND_ISLANDS; - case "Poland" -> POLAND; - case "France" -> FRANCE; - case "French Guiana" -> FRENCH_GUIANA; - case "French Southern Territories" -> FRENCH_SOUTHERN_TERRITORIES; - case "French Polynesia" -> FRENCH_POLYNESIA; - case "Fiji" -> FIJI; - case "Finland" -> FINLAND; - case "Philippines" -> PHILIPPINES; - case "Pitcairn" -> PITCAIRN; - case "Heard and McDonald Islands" -> HEARD_AND_MCDONALD_ISLANDS; - case "Hungary" -> HUNGARY; - case "Hong Kong" -> HONG_KONG; - case "" -> BLANK; - default -> throw new IllegalArgumentException("학력이 잘못되었습니다."); - }; + for (ENationality nationality : ENationality.values()) { + if (nationality.name().equalsIgnoreCase(value.toUpperCase())) { + return nationality; + } + } + throw new IllegalArgumentException("국적이 잘못되었습니다."); } + }