javajigi · Jan 15, 2019 · Jan 11, 2019 · Jan 14, 2019 · Jan 14, 2019
diff --git a/src/main/java/codesquad/ImsApplication.java b/src/main/java/codesquad/ImsApplication.java
@@ -7,7 +7,6 @@
 @SpringBootApplication
 @EnableJpaAuditing
 public class ImsApplication {
-
     public static void main(String[] args) {
         SpringApplication.run(ImsApplication.class, args);
     }

diff --git a/src/main/java/codesquad/WebMvcConfig.java b/src/main/java/codesquad/WebMvcConfig.java
@@ -11,6 +11,7 @@
 import org.springframework.format.FormatterRegistry;
 import org.springframework.web.method.support.HandlerMethodArgumentResolver;
 import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
+import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
 import org.springframework.web.servlet.config.annotation.ViewControllerRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 import support.converter.LocalDateConverter;
@@ -23,7 +24,8 @@ public class WebMvcConfig implements WebMvcConfigurer {
     @Override
     public void addFormatters(FormatterRegistry registry) {
         registry.addConverter(new LocalDateConverter("yyyy-MM-dd"));
-        registry.addConverter(new LocalDateTimeConverter("yyyy-MM-dd HH:mm:ss.SSS"));
+        registry.addConverter(new LocalDateTimeConverter("yyyy-MM-dd'T'HH:mm:ss.SSS"));
+        registry.addConverter(new LocalDateTimeConverter("yyyy-MM-dd'T'HH:mm"));
     }
 
     @Bean

diff --git a/src/main/java/codesquad/domain/Issue.java b/src/main/java/codesquad/domain/Issue.java
@@ -1,12 +1,13 @@
 package codesquad.domain;
 
 import codesquad.UnAuthorizedException;
-import codesquad.dto.IssueDto;
 import org.slf4j.Logger;
+import sun.jvm.hotspot.debugger.cdbg.basic.LazyBlockSym;
 import support.domain.AbstractEntity;
 
 import javax.persistence.*;
-import javax.validation.constraints.Size;
+
+import java.util.List;
 
 import static org.slf4j.LoggerFactory.getLogger;
 
@@ -22,6 +23,18 @@ public class Issue extends AbstractEntity {
     @JoinColumn(foreignKey = @ForeignKey(name = "fk_issue_writer"))
     private User writer;
 
+    @ManyToOne
+    @JoinColumn(foreignKey = @ForeignKey(name = "fk_issue_milestone"))
+    private Milestone milestone;
+
+    @OneToOne
+    @JoinColumn(foreignKey = @ForeignKey(name = "fk_issue_assignee"))
+    private User assignee;
+
+    @ManyToMany
+    @JoinColumn(foreignKey = @ForeignKey(name = "fk_issue_labels"))
+    private List<Label> lables;
+
     private boolean deleted = false;
 
     public Issue() {
@@ -65,12 +78,32 @@ public void writeBy(User loginUser) {
         this.writer = loginUser;
     }
 
-    public boolean isOwner(User loginUser) {
-        return writer.equals(loginUser);
+    public Milestone getMilestone() {
+        return milestone;
+    }
+
+    public void setMilestone(Milestone milestone) {
+        this.milestone = milestone;
+    }
+
+    public User getAssignee() {
+        return assignee;
+    }
+
+    public void setAssignee(User assignee) {
+        this.assignee = assignee;
     }
 
-    public IssueDto _toIssueDto() {
-        return new IssueDto(this.issueBody);
+    public List<Label> getLables() {
+        return lables;
+    }
+
+    public void setLables(List<Label> lables) {
+        this.lables = lables;
+    }
+
+    public boolean isOwner(User loginUser) {
+        return writer.equals(loginUser);
     }
 
     public void update(User loginUser, IssueBody target) {
@@ -81,11 +114,21 @@ public void update(User loginUser, IssueBody target) {
     }
 
     public void delete(User loginUser) {
-        log.debug("loginUser : {}", loginUser);
-        log.debug("writer : {}", writer);
         if (!isOwner(loginUser)) {
             throw new UnAuthorizedException();
         }
         this.deleted = true;
     }
+
+    public void addMilestone(Milestone milestone) {
+        this.milestone = milestone;
+    }
+
+    public void addAssignee(User assignee) {
+        this.assignee = assignee;
+    }
+
+    public void addLable(Label lable) {
+        this.lables.add(lable);
+    }
 }
diff --git a/src/main/java/codesquad/domain/Label.java b/src/main/java/codesquad/domain/Label.java
@@ -0,0 +1,30 @@
+package codesquad.domain;
+
+
+import support.domain.AbstractEntity;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+
+@Entity
+public class Label extends AbstractEntity {
+
+    @Column(nullable = false)
+    private String label;
+
+
+    public String getLabel() {
+        return label;
+    }
+
+    public void setLabel(String label) {
+        this.label = label;
+    }
+
+    @Override
+    public String toString() {
+        return "Label{" +
+                "label='" + label + '\'' +
+                '}';
+    }
+}
diff --git a/src/main/java/codesquad/domain/LabelRepository.java b/src/main/java/codesquad/domain/LabelRepository.java
@@ -0,0 +1,6 @@
+package codesquad.domain;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+
+public interface LabelRepository extends JpaRepository<Label, Long> {
+}
diff --git a/src/main/java/codesquad/domain/Milestone.java b/src/main/java/codesquad/domain/Milestone.java
@@ -0,0 +1,84 @@
+package codesquad.domain;
+
+import support.domain.AbstractEntity;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.Objects;
+
+@Entity
+public class Milestone extends AbstractEntity {
+
+    private String subject;
+
+    private LocalDateTime startDate;
+
+    private LocalDateTime endDate;
+
+    public Milestone() {
+
+    }
+
+    public Milestone(String subject, LocalDateTime startDate, LocalDateTime endDate) {
+        this.subject = subject;
+        this.startDate = startDate;
+        this.endDate = endDate;
+    }
+
+    public String getSubject() {
+        return subject;
+    }
+
+    public void setSubject(String subject) {
+        this.subject = subject;
+    }
+
+    public LocalDateTime getStartDate() {
+        return startDate;
+    }
+
+    public void setStartDate(LocalDateTime startDate) {
+        this.startDate = startDate;
+    }
+
+    public LocalDateTime getEndDate() {
+        return endDate;
+    }
+
+    public void setEndDate(LocalDateTime endDate) {
+        this.endDate = endDate;
+    }
+
+    public String getDueBy() {
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("MMM dd, yyyy");
+        LocalDateTime dateTime = endDate;
+        return dateTime.format(formatter);
+    }
+
+    @Override
+    public String toString() {
+        return "Milestone{" +
+                "subject='" + subject + '\'' +
+                ", startDate=" + startDate +
+                ", endDate=" + endDate +
+                '}';
+    }
+
+    @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;
+        Milestone milestone = (Milestone) o;
+        return Objects.equals(subject, milestone.subject) &&
+                Objects.equals(startDate, milestone.startDate) &&
+                Objects.equals(endDate, milestone.endDate);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(super.hashCode(), subject, startDate, endDate);
+    }
+}
diff --git a/src/main/java/codesquad/domain/MilestoneRepository.java b/src/main/java/codesquad/domain/MilestoneRepository.java
@@ -0,0 +1,6 @@
+package codesquad.domain;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+
+public interface MilestoneRepository extends JpaRepository<Milestone, Long> {
+}
diff --git a/src/main/java/codesquad/dto/IssueDto.java b/src/main/java/codesquad/dto/IssueDto.java
diff --git a/src/main/java/codesquad/security/RestSecurityControllerAdvice.java b/src/main/java/codesquad/security/RestSecurityControllerAdvice.java
@@ -9,6 +9,7 @@
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.bind.annotation.RestControllerAdvice;
 import support.domain.ErrorMessage;
+import support.domain.Result;
 
 import javax.persistence.EntityNotFoundException;
 
@@ -32,8 +33,15 @@ public void unAuthorized() {
 
     @ExceptionHandler(UnAuthenticationException.class)
     @ResponseStatus(value = HttpStatus.UNAUTHORIZED)
-    public ErrorMessage unAuthentication(UnAuthenticationException e) {
+    public Result unAuthentication(UnAuthenticationException e) {
         log.debug("JSON API UnAuthenticationException is happend!");
-        return new ErrorMessage(e.getMessage());
+        return Result.fail(e.getMessage());
     }
+
+//    @ExceptionHandler(UnAuthenticationException.class)
+//    @ResponseStatus(value = HttpStatus.UNAUTHORIZED)
+//    public ErrorMessage unAuthentication(UnAuthenticationException e) {
+//        log.debug("JSON API UnAuthenticationException is happend!");
+//        return new ErrorMessage(e.getMessage());
+//    }
 }