javajigi · Jan 6, 2019 · Jan 4, 2019 · javajigi · Jan 6, 2019
diff --git a/src/main/java/codesquad/CannotDeleteException.java b/src/main/java/codesquad/CannotDeleteException.java
@@ -0,0 +1,9 @@
+package codesquad;
+
+public class CannotDeleteException extends RuntimeException {
+    private static final long serialVersionUID = 1L;
+
+    public CannotDeleteException(String message) {
+        super(message);
+    }
+}
diff --git a/src/main/java/codesquad/domain/ContentType.java b/src/main/java/codesquad/domain/ContentType.java
@@ -0,0 +1,5 @@
+package codesquad.domain;
+
+public enum ContentType {
+    Issue;
+}
diff --git a/src/main/java/codesquad/domain/DeleteHIstory.java b/src/main/java/codesquad/domain/DeleteHIstory.java
@@ -0,0 +1,39 @@
+package codesquad.domain;
+
+import javax.persistence.*;
+import java.time.LocalDateTime;
+
+@Entity
+public class DeleteHIstory {
+    @Id
+    @GeneratedValue
+    private Long id;
+
+    @Enumerated(EnumType.STRING)
+    private ContentType contentType;
+
+    @ManyToOne
+    @JoinColumn(foreignKey = @ForeignKey(name = "fk_deletehistory_to_user"))
+    private User deleteBy;
+
+    private LocalDateTime createTime = LocalDateTime.now();
+
+    public DeleteHIstory() {
+    }
+
+    public DeleteHIstory(ContentType contentType,Long id, User deleteBy) {
+        this.contentType = contentType;
+        this.id = id;
+        this.deleteBy = deleteBy;
+    }
+
+    @Override
+    public String toString() {
+        return "DeleteHIstory{" +
+                "id=" + id +
+                ", contentType=" + contentType +
+                ", deleteBy=" + deleteBy +
+                ", createTime=" + createTime +
+                '}';
+    }
+}
diff --git a/src/main/java/codesquad/domain/DeleteHistoryRepository.java b/src/main/java/codesquad/domain/DeleteHistoryRepository.java
@@ -0,0 +1,7 @@
+package codesquad.domain;
+
+import org.springframework.data.repository.CrudRepository;
+
+public interface DeleteHistoryRepository extends CrudRepository<DeleteHIstory, Long> {
+
+}
diff --git a/src/main/java/codesquad/domain/Issue.java b/src/main/java/codesquad/domain/Issue.java
@@ -1,9 +1,11 @@
 package codesquad.domain;
 
+import codesquad.CannotDeleteException;
+import codesquad.UnAuthorizedException;
+import codesquad.dto.IssueDto;
 import support.domain.AbstractEntity;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
+import javax.persistence.*;
 import javax.validation.constraints.Size;
 
 @Entity
@@ -17,18 +19,29 @@ public class Issue extends AbstractEntity {
     @Column(nullable = false, length = 500)
     private String comment;
 
+    @ManyToOne
+    @JoinColumn(foreignKey = @ForeignKey(name = "fk_Issue_writter"))
+    private User writer;
+
+    private boolean deleted = false;
+
     public Issue() {
     }
 
-    public Issue(@Size(min = 3, max = 50) String subject, @Size(min = 3, max = 500) String content) {
+    public Issue(String subject, String content) {
         this.subject = subject;
         this.comment = content;
     }
 
-    public Issue(long id, @Size(min = 3, max = 50) String subject, @Size(min = 3, max = 500) String content) {
+    public Issue(String subject, String comment, User writer) {
+        this(0L, subject, comment, writer);
+    }
+
+    public Issue(long id, String subject, String content, User writer) {
         super(id);
         this.subject = subject;
         this.comment = content;
+        this.writer = writer;
     }
 
     public String getSubject() {
@@ -47,8 +60,56 @@ public void setComment(String comment) {
         this.comment = comment;
     }
 
+    public User getWriter() {
+        return writer;
+    }
+
+    public void setWriter(User writer) {
+        this.writer = writer;
+    }
+
+    public boolean isDeleted() {
+        return deleted;
+    }
+
+    public void setDeleted(boolean deleted) {
+        this.deleted = deleted;
+    }
+
+    public void update(User loginUser, Issue toIssue) {
+        if (!matchWriter(loginUser)) {
+            throw new UnAuthorizedException();
+        }
+
+        if (!matchPassord(loginUser.getPassword())) {
+            return;
+        }
+        this.subject = toIssue.subject;
+        this.comment = toIssue.comment;
+    }
+
+    public boolean isOwner(User loginUser) {
+        return writer.equals(loginUser);
+    }
+
+    private boolean matchPassord(String password) {
+        return this.writer.getPassword().equals(password);
+    }
+
+    private boolean matchWriter(User loginUser) {
+        return this.writer.getUserId().equals(loginUser.getUserId());
+    }
+
 //    ApiIssueController에서 사용할 것이지만 일단은 만들어 보았다.
-//    public IssueDto _toIssueDto() {
-//        return new IssueDto(this.subject, this.comment);
-//    }
+    public IssueDto _toIssueDto() {
+        return new IssueDto(this.subject, this.comment, this.writer);
+    }
+
+    public DeleteHIstory delete(User loginUser) {
+        if (!this.writer.equals(loginUser)) {
+            throw new CannotDeleteException("본인외의 정보는 삭제할수 없습니다.");
+        }
+        this.deleted = true;
+        return new DeleteHIstory(ContentType.Issue, getId(), loginUser);
+    }
 }
diff --git a/src/main/java/codesquad/domain/IssueRepository.java b/src/main/java/codesquad/domain/IssueRepository.java
@@ -2,9 +2,7 @@
 
 import org.springframework.data.jpa.repository.JpaRepository;
 
-import java.util.Optional;
-
 public interface IssueRepository extends JpaRepository<Issue, Long> {
-    @Override
-    Optional<Issue> findById(Long Long);
+
+   Iterable<Issue> findByDelete(boolean b);
 }
diff --git a/src/main/java/codesquad/domain/User.java b/src/main/java/codesquad/domain/User.java
@@ -8,6 +8,7 @@
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.validation.constraints.Size;
+import java.util.Objects;
 
 @Entity
 public class User extends AbstractEntity {
@@ -29,13 +30,8 @@ public class User extends AbstractEntity {
     public User() {
     }
 
-    /*    public User(String userId, String password, String name) {
-            this(0L, userId, password, name);
-        }*/
     public User(String userId, String password, String name) {
-        this.userId = userId;
-        this.password = password;
-        this.name = name;
+        this(0L, userId, password, name);
     }
 
     public User(long id, String userId, String password, String name) {
@@ -82,7 +78,7 @@ public void update(User loginUser, User target) {
         }
 
         if (!matchPassword(target.getPassword())) {
-            return;
+            throw new UnAuthorizedException();
         }
 
         this.name = target.name;
@@ -110,6 +106,26 @@ public boolean isGuestUser() {
 
     @Override
     public String toString() {
-        return "User [userId=" + userId + ", password=" + password + ", name=" + name + "]";
+        return "User{" +
+                "userId='" + userId + '\'' +
+                ", password='" + password + '\'' +
+                ", name='" + name + '\'' +
+                '}';
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        if (!super.equals(o)) return false;
+        User user = (User) o;
+        return Objects.equals(userId, user.userId) &&
+                Objects.equals(password, user.password) &&
+                Objects.equals(name, user.name);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(super.hashCode(), userId, password, name);
     }
 }
diff --git a/src/main/java/codesquad/dto/IssueDto.java b/src/main/java/codesquad/dto/IssueDto.java
@@ -1,6 +1,7 @@
 package codesquad.dto;
 
 import codesquad.domain.Issue;
+import codesquad.domain.User;
 
 import javax.validation.constraints.Size;
 
@@ -11,18 +12,35 @@ public class IssueDto {
     @Size(min = 3, max = 500)
     private String comment;
 
+    private User writer;
+
+    private boolean deleted;
+
     public IssueDto() {
     }
 
-    public IssueDto(@Size(min = 3, max = 50) String subject, @Size(min = 3, max = 500) String content) {
+    public IssueDto(String subject, String content, User writer) {
         this.subject = subject;
         this.comment = content;
+        this.writer = writer;
+    }
+
+    public void writeBy(User user) {
+        this.writer = user;
     }
 
     public String getSubject() {
         return subject;
     }
 
+    public User getWriter() {
+        return writer;
+    }
+
+    public void setWriter(User writer) {
+        this.writer = writer;
+    }
+
     public void setSubject(String subject) {
         this.subject = subject;
     }
@@ -35,8 +53,16 @@ public void setComment(String comment) {
         this.comment = comment;
     }
 
+    public boolean isDeleted() {
+        return deleted;
+    }
+
+    public void setDeleted(boolean deleted) {
+        this.deleted = deleted;
+    }
+
     public Issue _toIssue() {
-        return new Issue(subject, comment);
+        return new Issue(this.subject, this.comment, this.writer);
     }
 
     @Override

diff --git a/src/main/java/codesquad/dto/UserDto.java b/src/main/java/codesquad/dto/UserDto.java
@@ -15,11 +15,10 @@ public class UserDto {
     private String name;
 
     public UserDto() {
-
     }
 
     public UserDto(String userId, String password, String name) {
-//        super();
+        super();
         this.userId = userId;
         this.password = password;
         this.name = name;

diff --git a/src/main/java/codesquad/security/HttpSessionUtils.java b/src/main/java/codesquad/security/HttpSessionUtils.java
@@ -33,7 +33,6 @@ public static User getUserFromSession(HttpSession session) {
         if (!isLoginUser(session)) {
             return null;
         }
-
         return (User) session.getAttribute(USER_SESSION_KEY);
     }
 }
diff --git a/src/main/java/codesquad/security/SecurityControllerAdvice.java b/src/main/java/codesquad/security/SecurityControllerAdvice.java
@@ -10,6 +10,7 @@
 import org.springframework.web.bind.annotation.ResponseStatus;
 
 import javax.persistence.EntityNotFoundException;
+import javax.security.auth.login.LoginException;
 
 @ControllerAdvice
 public class SecurityControllerAdvice {
@@ -32,4 +33,8 @@ public void unAuthorized() {
     public void unAuthentication() {
         log.debug("UnAuthenticationException is happened!");
     }
+
+    @ExceptionHandler(LoginException.class)
+    @ResponseStatus(value = HttpStatus.FORBIDDEN)
+    public void loginFail() {log.debug("login fail");}
 }
diff --git a/src/main/java/codesquad/service/DeleteHistoryService.java b/src/main/java/codesquad/service/DeleteHistoryService.java
@@ -0,0 +1,21 @@
+package codesquad.service;
+
+import codesquad.domain.DeleteHistoryRepository;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+@Service
+public class DeleteHistoryService {
+
+    @Resource(name = "deleteHistoryRepository")
+    private DeleteHistoryRepository deleteHistoryRepository;
+
+//    @Transactional(propagation = Propagation.REQUIRES_NEW)
+//    public void saveAll() {
+//        deleteHistoryRepository.save();
+//    }
+}