Merge pull request #33 from SafeNet-2024/feature/add-security

[refactor] 엔티티 컬럼 수정 및 message 저장시 receiver 저장
SafeNet-2024 · Jun 13, 2024 · 7c5331b · 7c5331b
2 parents c541df3 + f2b1fec
commit 7c5331b
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 20 deletions.
diff --git a/src/main/java/com/SafeNet/Backend/domain/file/entity/File.java b/src/main/java/com/SafeNet/Backend/domain/file/entity/File.java
@@ -18,18 +18,14 @@
 public class File {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
-    @Column(name = "files_id")
+    @Column(name = "file_id")
     private Long id;
 
     @Enumerated(EnumType.STRING)
-    @Column(name = "file_type", nullable = false)
+    @Column(nullable = false)
     private FileType fileType;
 
     @Lob
     @Column(nullable = false)
     private String fileUrl;
-
-    @CreationTimestamp
-    @Column(name = "created_at", nullable = false, updatable = false)
-    private LocalDateTime createdAt;
 }
diff --git a/src/main/java/com/SafeNet/Backend/domain/member/entity/Member.java b/src/main/java/com/SafeNet/Backend/domain/member/entity/Member.java
@@ -28,6 +28,7 @@
 @Entity
 @Table(name = "member")
 public class Member extends BaseTimeEntity implements UserDetails {
+    @Getter
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     @Column(name = "member_id")
@@ -40,10 +41,9 @@ public class Member extends BaseTimeEntity implements UserDetails {
     @Column(name = "name", nullable = false, unique = true, length = 100)
     private String name;
 
-    @Column(name = "phoneNumber")
     private String phoneNumber;
 
-    @Column(name = "pwd",nullable = false)
+    @Column(nullable = false)
     @NotNull
     private String pwd;
 
@@ -69,10 +69,6 @@ public class Member extends BaseTimeEntity implements UserDetails {
     @JsonIgnore
     private List<PostLike> postLikeList;
 
-    public Long getId() {
-        return id;
-    }
-
     public void updateProfile(String name, String phoneNumber, String password, Region region) {
         this.name = name;
         this.phoneNumber = phoneNumber;
@@ -89,25 +85,30 @@ public Collection<? extends GrantedAuthority> getAuthorities() {
     public String getPassword() {
         return this.pwd;
     }
+
     @Override
     public String getUsername() {
         return this.email;
     }
+
     // 계정 만료되었는지 (true - 만료 안됨)
     @Override
     public boolean isAccountNonExpired() {
         return true;
     }
+
     // 계정 잠겨있는지 (true - 안잠김)
     @Override
     public boolean isAccountNonLocked() {
         return true;
     }
+
     // 계정 비밀번호 만료되었는지 (true - 만료 X)
     @Override
     public boolean isCredentialsNonExpired() {
         return true;
     }
+
     // 계정 활성화 상태인지 (true - 활성화)
     @Override
     public boolean isEnabled() {

diff --git a/src/main/java/com/SafeNet/Backend/domain/message/entity/Message.java b/src/main/java/com/SafeNet/Backend/domain/message/entity/Message.java
@@ -29,7 +29,8 @@ public class Message {
     @Column(nullable = false)
     private String sender;
 
-    private String receiver;
+//    @Column(nullable = false)
+//    private String receiver;
 
     @Column(nullable = false)
     private String message;

diff --git a/src/main/java/com/SafeNet/Backend/domain/messageRoom/service/MessageRoomService.java b/src/main/java/com/SafeNet/Backend/domain/messageRoom/service/MessageRoomService.java
@@ -310,7 +310,6 @@ public void handleMessage(String roomId, String username, MessageDto messageDto)
                 .sender(messageDto.getSender())
                 .roomId(messageDto.getRoomId())
                 .message(messageDto.getMessage())
-                .sentTime(LocalDateTime.now().toString())
                 .build();
 
         // Websocket에 발행된 메시지를 redis로 발행한다(publish)

diff --git a/src/main/java/com/SafeNet/Backend/domain/post/entity/Post.java b/src/main/java/com/SafeNet/Backend/domain/post/entity/Post.java
@@ -60,7 +60,7 @@ public class Post {
     private LocalDateTime created;
 
     @UpdateTimestamp
-    @Column(nullable = false)
+    @Column(name = "updated_at")
     private LocalDateTime updated;
 
     @Enumerated(EnumType.STRING)

diff --git a/src/main/java/com/SafeNet/Backend/domain/postLike/entity/PostLike.java b/src/main/java/com/SafeNet/Backend/domain/postLike/entity/PostLike.java
@@ -28,10 +28,10 @@ public class PostLike {
 
     @CreationTimestamp
     @Column(name = "created_at", nullable = false, updatable = false)
-    private LocalDateTime createdAt;
+    private LocalDateTime created;
 
     @UpdateTimestamp
-    @Column(nullable = false)
+    @Column(name = "updated_at")
     private LocalDateTime updated;
 
     @ManyToOne(fetch = LAZY)

diff --git a/src/main/java/com/SafeNet/Backend/domain/region/entity/Region.java b/src/main/java/com/SafeNet/Backend/domain/region/entity/Region.java
@@ -23,13 +23,13 @@ public class Region {
     @Column(name = "region_id")
     private Long id;
 
-    @Column(length = 30, nullable = false)
+    @Column(length = 50, nullable = false)
     private String city;
 
-    @Column(length = 30)
+    @Column(length = 50)
     private String county;
 
-    @Column(length = 30)
+    @Column(length = 50)
     private String district;
 
     @OneToMany(mappedBy = "region", cascade = CascadeType.ALL, orphanRemoval = true)