Merge branch 'Be/Board' into 'backend'
[Back-End] feat : timezone 변경 See merge request s11-webmobile1-sub2/S11P12A701!141
This commit is contained in:
commit
5ccd0e87a9
@ -6,6 +6,7 @@ import lombok.Getter;
|
|||||||
import lombok.Setter;
|
import lombok.Setter;
|
||||||
|
|
||||||
import java.time.LocalDateTime;
|
import java.time.LocalDateTime;
|
||||||
|
import java.util.Date;
|
||||||
|
|
||||||
@Builder
|
@Builder
|
||||||
@Getter
|
@Getter
|
||||||
@ -17,6 +18,6 @@ public class ResponseBoardDetailDto {
|
|||||||
private String title;
|
private String title;
|
||||||
private String content;
|
private String content;
|
||||||
private boolean isMine;
|
private boolean isMine;
|
||||||
private LocalDateTime createdAt;
|
private Date createdAt;
|
||||||
private LocalDateTime modifiedAt;
|
private Date modifiedAt;
|
||||||
}
|
}
|
||||||
|
@ -6,6 +6,7 @@ import lombok.Getter;
|
|||||||
import lombok.Setter;
|
import lombok.Setter;
|
||||||
|
|
||||||
import java.time.LocalDateTime;
|
import java.time.LocalDateTime;
|
||||||
|
import java.util.Date;
|
||||||
|
|
||||||
@Builder
|
@Builder
|
||||||
@Getter
|
@Getter
|
||||||
@ -14,5 +15,5 @@ public class ResponseBoardSummaryDto {
|
|||||||
private long id;
|
private long id;
|
||||||
private String name;
|
private String name;
|
||||||
private String title;
|
private String title;
|
||||||
private LocalDateTime createdAt;
|
private Date createdAt;
|
||||||
}
|
}
|
||||||
|
@ -6,6 +6,7 @@ import lombok.Setter;
|
|||||||
|
|
||||||
import java.time.LocalDateTime;
|
import java.time.LocalDateTime;
|
||||||
import java.time.LocalTime;
|
import java.time.LocalTime;
|
||||||
|
import java.util.Date;
|
||||||
|
|
||||||
@Builder
|
@Builder
|
||||||
@Getter
|
@Getter
|
||||||
@ -15,6 +16,6 @@ public class ResponseCommentDto {
|
|||||||
private String name;
|
private String name;
|
||||||
private String content;
|
private String content;
|
||||||
private boolean isMine;
|
private boolean isMine;
|
||||||
private LocalDateTime createAt;
|
private Date createAt;
|
||||||
private LocalDateTime modifiedAt;
|
private Date modifiedAt;
|
||||||
}
|
}
|
||||||
|
@ -15,6 +15,7 @@ import org.springframework.data.annotation.LastModifiedDate;
|
|||||||
import org.springframework.data.jpa.domain.support.AuditingEntityListener;
|
import org.springframework.data.jpa.domain.support.AuditingEntityListener;
|
||||||
|
|
||||||
import java.time.LocalDateTime;
|
import java.time.LocalDateTime;
|
||||||
|
import java.util.Date;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
@Entity
|
@Entity
|
||||||
@ -42,13 +43,15 @@ public class Board {
|
|||||||
@Column(nullable = true)
|
@Column(nullable = true)
|
||||||
private int viewCount;
|
private int viewCount;
|
||||||
|
|
||||||
@Column(columnDefinition = "TIMESTAMP")
|
@Column
|
||||||
@CreationTimestamp
|
@CreationTimestamp
|
||||||
LocalDateTime createdAt;
|
@Temporal(TemporalType.TIMESTAMP)
|
||||||
|
private Date createdAt;
|
||||||
|
|
||||||
@Column(columnDefinition = "TIMESTAMP")
|
@Column
|
||||||
@UpdateTimestamp
|
@UpdateTimestamp
|
||||||
LocalDateTime modifiedAt;
|
@Temporal(TemporalType.TIMESTAMP)
|
||||||
|
private Date modifiedAt;
|
||||||
|
|
||||||
@ManyToOne(fetch = FetchType.LAZY)
|
@ManyToOne(fetch = FetchType.LAZY)
|
||||||
@JoinColumn(name = "user_id")
|
@JoinColumn(name = "user_id")
|
||||||
|
@ -15,6 +15,7 @@ import org.springframework.data.annotation.CreatedDate;
|
|||||||
import org.springframework.data.annotation.LastModifiedDate;
|
import org.springframework.data.annotation.LastModifiedDate;
|
||||||
|
|
||||||
import java.time.LocalDateTime;
|
import java.time.LocalDateTime;
|
||||||
|
import java.util.Date;
|
||||||
|
|
||||||
@Entity
|
@Entity
|
||||||
@Builder
|
@Builder
|
||||||
@ -30,13 +31,14 @@ public class Comment {
|
|||||||
@Column(columnDefinition = "TEXT", nullable = false)
|
@Column(columnDefinition = "TEXT", nullable = false)
|
||||||
private String content;
|
private String content;
|
||||||
|
|
||||||
@Column(columnDefinition = "TIMESTAMP")
|
@Column
|
||||||
@CreationTimestamp
|
@CreationTimestamp
|
||||||
private LocalDateTime createdAt;
|
@Temporal(TemporalType.TIMESTAMP)
|
||||||
|
private Date createdAt;
|
||||||
|
|
||||||
@Column(columnDefinition = "TIMESTAMP")
|
@Column
|
||||||
@UpdateTimestamp
|
@Temporal(TemporalType.TIMESTAMP)
|
||||||
private LocalDateTime modifiedAt;
|
private Date modifiedAt;
|
||||||
|
|
||||||
@ManyToOne
|
@ManyToOne
|
||||||
@JoinColumn(name = "user_id")
|
@JoinColumn(name = "user_id")
|
||||||
|
@ -14,6 +14,6 @@ public class ReportDetailResponseDto {
|
|||||||
private int allCount;
|
private int allCount;
|
||||||
private String title;
|
private String title;
|
||||||
private int correctCount;
|
private int correctCount;
|
||||||
private LocalDateTime testAt;
|
private Date testAt;
|
||||||
private List<QuizDto> quizzes;
|
private List<QuizDto> quizzes;
|
||||||
}
|
}
|
@ -16,5 +16,5 @@ public class ReportResponse {
|
|||||||
private String title;
|
private String title;
|
||||||
private int allCount;
|
private int allCount;
|
||||||
private int correctCount;
|
private int correctCount;
|
||||||
private LocalDateTime date;
|
private Date date;
|
||||||
}
|
}
|
||||||
|
@ -4,6 +4,7 @@ package com.edufocus.edufocus.report.entity.dto;
|
|||||||
import lombok.*;
|
import lombok.*;
|
||||||
|
|
||||||
import java.time.LocalDateTime;
|
import java.time.LocalDateTime;
|
||||||
|
import java.util.Date;
|
||||||
import java.util.UUID;
|
import java.util.UUID;
|
||||||
|
|
||||||
@Builder
|
@Builder
|
||||||
@ -14,5 +15,5 @@ import java.util.UUID;
|
|||||||
public class ReportSetResponse {
|
public class ReportSetResponse {
|
||||||
private UUID reportSetId;
|
private UUID reportSetId;
|
||||||
private String quizSetTitle;
|
private String quizSetTitle;
|
||||||
private LocalDateTime testAt;
|
private Date testAt;
|
||||||
}
|
}
|
||||||
|
@ -31,9 +31,10 @@ public class Report {
|
|||||||
|
|
||||||
private int correctCount;
|
private int correctCount;
|
||||||
|
|
||||||
@Column(columnDefinition = "TIMESTAMP")
|
@Column
|
||||||
@CreationTimestamp
|
@CreationTimestamp
|
||||||
private LocalDateTime testAt;
|
@Temporal(TemporalType.TIMESTAMP)
|
||||||
|
private Date testAt;
|
||||||
|
|
||||||
private Long lectureId;
|
private Long lectureId;
|
||||||
|
|
||||||
|
@ -14,6 +14,7 @@ import org.springframework.data.jpa.domain.support.AuditingEntityListener;
|
|||||||
|
|
||||||
|
|
||||||
import java.time.LocalDateTime;
|
import java.time.LocalDateTime;
|
||||||
|
import java.util.Date;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.UUID;
|
import java.util.UUID;
|
||||||
|
|
||||||
@ -35,9 +36,10 @@ public class ReportSet {
|
|||||||
)
|
)
|
||||||
private UUID id;
|
private UUID id;
|
||||||
|
|
||||||
@Column(columnDefinition = "TIMESTAMP")
|
@Column
|
||||||
@CreationTimestamp
|
@CreationTimestamp
|
||||||
private LocalDateTime createAt;
|
@Temporal(TemporalType.TIMESTAMP)
|
||||||
|
private Date createAt;
|
||||||
|
|
||||||
@OneToMany(mappedBy = "reportSet", cascade = CascadeType.REMOVE)
|
@OneToMany(mappedBy = "reportSet", cascade = CascadeType.REMOVE)
|
||||||
private List<Report> reports;
|
private List<Report> reports;
|
||||||
|
Loading…
Reference in New Issue
Block a user