Merge pull request #20 from hanghaebnb/feature/19

[FIX] 자잘한 오류 해결
hanghaebnb · Dec 26, 2022 · 087e32c · 087e32c
2 parents 5f35dcc + 3d1220c
commit 087e32c
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 6 deletions.
diff --git a/src/main/java/com/cloneweek/hanghaebnb/dto/RoomResponseDto.java b/src/main/java/com/cloneweek/hanghaebnb/dto/RoomResponseDto.java
@@ -34,8 +34,8 @@ public RoomResponseDto(Room room, String nickname){
 
     }
 
-    public RoomResponseDto(Room room, String nickname, boolean likeCheck){
-        this.nickname = nickname;
+    public RoomResponseDto(Room room, boolean likeCheck){
+        this.nickname = room.getUser().getNickname();
         this.id = room.getId();
         this.title = room.getTitle();
         this.type = room.getType();

diff --git a/src/main/java/com/cloneweek/hanghaebnb/dto/SignupRequestDto.java b/src/main/java/com/cloneweek/hanghaebnb/dto/SignupRequestDto.java
@@ -9,7 +9,7 @@
 @NoArgsConstructor
 public class SignupRequestDto {
 
-    @Pattern(regexp = "[a-z0-9]{4,10}")
+//    @Pattern(regexp = "[a-z0-9]{4,10}")
     private String email;
 
     @Pattern(regexp = "[a-z0-9A-Z!@#$%^&*]{8,15}")

diff --git a/src/main/java/com/cloneweek/hanghaebnb/entity/ImageFile.java b/src/main/java/com/cloneweek/hanghaebnb/entity/ImageFile.java
@@ -17,11 +17,11 @@ public class ImageFile {
     private String path;
 
     @ManyToOne(fetch = FetchType.LAZY)
-    @JoinColumn(name = "userid", nullable = false)
+    @JoinColumn(name = "user_id", nullable = false)
     private User user;                  // userid
 
     @OneToOne
-    @JoinColumn(name = "roomid", nullable = false)
+    @JoinColumn(name = "room_id", nullable = false)
     private Room room;
 
     public ImageFile(String path, User user, Room room) {

diff --git a/src/main/java/com/cloneweek/hanghaebnb/service/RoomService.java b/src/main/java/com/cloneweek/hanghaebnb/service/RoomService.java
@@ -63,7 +63,6 @@ public List<RoomResponseDto> getRooms(Pageable pageable, User user) {
         for (Room room : roomList) {
           roomResponseDto.add(new RoomResponseDto(
                   room,
-                  user.getNickname(),
                   (checkLike(room.getId(), user))));
         }
         return roomResponseDto;