Merge pull request #25 from nunsongCookie/fix/24-fix-user-blank

Fix/24 fix user blank
nunsongCookie · Dec 26, 2024 · f0ae9fe · f0ae9fe
2 parents b614ec0 + 7a7248b
commit f0ae9fe
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/src/main/java/site/examready2025/quiz/domain/user/entity/User.java b/src/main/java/site/examready2025/quiz/domain/user/entity/User.java
@@ -1,6 +1,7 @@
 package site.examready2025.quiz.domain.user.entity;
 
 import jakarta.persistence.*;
+import jakarta.validation.constraints.NotBlank;
 import lombok.Builder;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
@@ -21,6 +22,7 @@ public class User {
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long id;
 
+    @NotBlank(message = "Name cannot be blank")
     @Column(nullable = false, length = 15)
     private String name;
 

diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
@@ -13,6 +13,7 @@ spring:
       hibernate.dialect: org.hibernate.dialect.MySQL8Dialect
       hibernate.format_sql: true
       hibernate.transaction.jta.platform: org.hibernate.engine.transaction.jta.platform.internal.NoJtaPlatform
+<<<<<<< Updated upstream
 
 management:
   endpoint:
@@ -21,4 +22,6 @@ management:
   endpoints:
     web:
       exposure:
-        include: "health"
+        include: "health"
+=======
+>>>>>>> Stashed changes