Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions src/main/java/com/tiki/server/auth/token/entity/Token.java
Original file line number Diff line number Diff line change
@@ -1,18 +1,19 @@
package com.tiki.server.auth.token.entity;

import jakarta.validation.constraints.NotNull;
import lombok.Builder;
import lombok.NonNull;

import org.springframework.data.redis.core.RedisHash;

import static lombok.AccessLevel.PRIVATE;

@Builder(access = PRIVATE)
@RedisHash(value = "refreshToken", timeToLive = 1209600000L)
public record Token(
long id,
@NonNull String refreshToken
@NotNull long id,
@NotNull String refreshToken
) {
public static Token of(long id, String refreshToken) {
return Token.builder().id(id).refreshToken(refreshToken).build();
}
public static Token of(long id, String refreshToken) {
return Token.builder().id(id).refreshToken(refreshToken).build();
}
}
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
package com.tiki.server.note.service.dto.request;

import lombok.NonNull;
import jakarta.validation.constraints.NotNull;

import java.time.LocalDate;
import java.util.List;

public record NoteBase(
@NonNull String title,
boolean complete,
@NonNull LocalDate startDate,
@NonNull LocalDate endDate,
long memberId,
long teamId,
List<Long> timeBlockIds,
List<Long> documentIds
@NotNull String title,
@NotNull boolean complete,
@NotNull LocalDate startDate,
@NotNull LocalDate endDate,
@NotNull long memberId,
@NotNull long teamId,
@NotNull List<Long> timeBlockIds,
@NotNull List<Long> documentIds
) {

public static NoteBase of(final NoteFreeCreateServiceRequest noteFreeCreateServiceRequest) {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,21 +1,22 @@
package com.tiki.server.note.service.dto.request;

import com.tiki.server.note.controller.dto.request.NoteFreeCreateRequest;
import lombok.NonNull;

import jakarta.validation.constraints.NotNull;

import java.time.LocalDate;
import java.util.List;

public record NoteFreeCreateServiceRequest(
@NonNull String title,
boolean complete,
@NonNull LocalDate startDate,
@NonNull LocalDate endDate,
@NonNull String contents,
long teamId,
List<Long> timeBlockIds,
List<Long> documentIds,
long memberId
@NotNull String title,
@NotNull boolean complete,
@NotNull LocalDate startDate,
@NotNull LocalDate endDate,
@NotNull String contents,
@NotNull long teamId,
@NotNull List<Long> timeBlockIds,
@NotNull List<Long> documentIds,
@NotNull long memberId
) {
public static NoteFreeCreateServiceRequest of(
final NoteFreeCreateRequest request,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,40 +1,41 @@
package com.tiki.server.note.service.dto.request;

import com.tiki.server.note.controller.dto.request.NoteFreeUpdateRequest;
import lombok.NonNull;

import jakarta.validation.constraints.NotNull;

import java.time.LocalDate;
import java.util.List;

public record NoteFreeUpdateServiceRequest(
long noteId,
@NonNull String title,
boolean complete,
@NonNull LocalDate startDate,
@NonNull LocalDate endDate,
@NonNull String contents,
long teamId,
List<Long> timeBlockIds,
List<Long> documentIds,
long memberId
@NotNull long noteId,
@NotNull String title,
@NotNull boolean complete,
@NotNull LocalDate startDate,
@NotNull LocalDate endDate,
@NotNull String contents,
@NotNull long teamId,
@NotNull List<Long> timeBlockIds,
@NotNull List<Long> documentIds,
@NotNull long memberId
) {

public static NoteFreeUpdateServiceRequest of(
final NoteFreeUpdateRequest request,
final long noteId,
final long memberId
) {
return new NoteFreeUpdateServiceRequest(
noteId,
request.title(),
request.complete(),
request.startDate(),
request.endDate(),
request.contents(),
request.teamId(),
request.timeBlockIds(),
request.documentIds(),
memberId
);
}
public static NoteFreeUpdateServiceRequest of(
final NoteFreeUpdateRequest request,
final long noteId,
final long memberId
) {
return new NoteFreeUpdateServiceRequest(
noteId,
request.title(),
request.complete(),
request.startDate(),
request.endDate(),
request.contents(),
request.teamId(),
request.timeBlockIds(),
request.documentIds(),
memberId
);
}
}
Original file line number Diff line number Diff line change
@@ -1,24 +1,25 @@
package com.tiki.server.note.service.dto.request;

import com.tiki.server.note.controller.dto.request.NoteTemplateCreateRequest;
import lombok.NonNull;

import jakarta.validation.constraints.NotNull;

import java.time.LocalDate;
import java.util.List;

public record NoteTemplateCreateServiceRequest(
@NonNull String title,
boolean complete,
@NonNull LocalDate startDate,
@NonNull LocalDate endDate,
@NonNull String answerWhatActivity,
@NonNull String answerHowToPrepare,
@NonNull String answerWhatIsDisappointedThing,
@NonNull String answerHowToFix,
long teamId,
List<Long> timeBlockIds,
List<Long> documentIds,
long memberId
@NotNull String title,
@NotNull boolean complete,
@NotNull LocalDate startDate,
@NotNull LocalDate endDate,
@NotNull String answerWhatActivity,
@NotNull String answerHowToPrepare,
@NotNull String answerWhatIsDisappointedThing,
@NotNull String answerHowToFix,
@NotNull long teamId,
@NotNull List<Long> timeBlockIds,
@NotNull List<Long> documentIds,
@NotNull long memberId
) {
public static NoteTemplateCreateServiceRequest of(
final NoteTemplateCreateRequest request,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,25 +1,26 @@
package com.tiki.server.note.service.dto.request;

import com.tiki.server.note.controller.dto.request.NoteTemplateUpdateRequest;
import lombok.NonNull;

import jakarta.validation.constraints.NotNull;

import java.time.LocalDate;
import java.util.List;

public record NoteTemplateUpdateServiceRequest(
long noteId,
@NonNull String title,
boolean complete,
@NonNull LocalDate startDate,
@NonNull LocalDate endDate,
@NonNull String answerWhatActivity,
@NonNull String answerHowToPrepare,
@NonNull String answerWhatIsDisappointedThing,
@NonNull String answerHowToFix,
long teamId,
List<Long> timeBlockIds,
List<Long> documentIds,
long memberId
@NotNull long noteId,
@NotNull String title,
@NotNull boolean complete,
@NotNull LocalDate startDate,
@NotNull LocalDate endDate,
@NotNull String answerWhatActivity,
@NotNull String answerHowToPrepare,
@NotNull String answerWhatIsDisappointedThing,
@NotNull String answerHowToFix,
@NotNull long teamId,
@NotNull List<Long> timeBlockIds,
@NotNull List<Long> documentIds,
@NotNull long memberId
) {

public static NoteTemplateUpdateServiceRequest of(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,41 +7,42 @@
import com.tiki.server.note.entity.NoteType;
import com.tiki.server.timeblock.entity.TimeBlock;
import com.tiki.server.timeblock.service.dto.response.TimeBlockTagServiceResponse;
import lombok.NonNull;

import jakarta.validation.constraints.NotNull;

import java.time.LocalDate;
import java.util.List;

public record NoteFreeDetailGetServiceResponse(
long noteId,
@NonNull NoteType noteType,
@NonNull String title,
@NonNull String author,
@NonNull LocalDate startDate,
@NonNull LocalDate endDate,
boolean complete,
@NonNull String contents,
List<DocumentTagGetServiceResponse> documentList,
List<TimeBlockTagServiceResponse> timeBlockList
@NotNull long noteId,
@NotNull NoteType noteType,
@NotNull String title,
@NotNull String author,
@NotNull LocalDate startDate,
@NotNull LocalDate endDate,
@NotNull boolean complete,
@NotNull String contents,
@NotNull List<DocumentTagGetServiceResponse> documentList,
@NotNull List<TimeBlockTagServiceResponse> timeBlockList
) implements NoteDetailGetServiceResponse {

public static NoteFreeDetailGetServiceResponse of(
final Note note,
final String author,
final List<Document> documentList,
final List<TimeBlock> timeBlockList
) {
return new NoteFreeDetailGetServiceResponse(
note.getId(),
NoteType.FREE,
note.getTitle(),
author,
note.getStartDate(),
note.getEndDate(),
note.isComplete(),
ContentDecoder.decodeNoteFree(note.getContents()),
documentList.stream().map(DocumentTagGetServiceResponse::from).toList(),
timeBlockList.stream().map(TimeBlockTagServiceResponse::from).toList()
);
}
public static NoteFreeDetailGetServiceResponse of(
final Note note,
final String author,
final List<Document> documentList,
final List<TimeBlock> timeBlockList
) {
return new NoteFreeDetailGetServiceResponse(
note.getId(),
NoteType.FREE,
note.getTitle(),
author,
note.getStartDate(),
note.getEndDate(),
note.isComplete(),
ContentDecoder.decodeNoteFree(note.getContents()),
documentList.stream().map(DocumentTagGetServiceResponse::from).toList(),
timeBlockList.stream().map(TimeBlockTagServiceResponse::from).toList()
);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,16 @@
import java.time.LocalDate;
import java.time.LocalDateTime;

import jakarta.validation.constraints.NotNull;

public record NoteGetResponse(
long noteId,
String title,
LocalDate startDate,
LocalDate endDate,
String author,
boolean complete,
LocalDateTime lastUpdatedAt
@NotNull long noteId,
@NotNull String title,
@NotNull LocalDate startDate,
@NotNull LocalDate endDate,
@NotNull String author,
@NotNull boolean complete,
@NotNull LocalDateTime lastUpdatedAt
) {

public static NoteGetResponse of(final Note note, final String author) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,10 @@

import java.util.List;

import jakarta.validation.constraints.NotNull;

public record NoteListGetServiceResponse(
List<NoteGetResponse> noteGetResponseList
@NotNull List<NoteGetResponse> noteGetResponseList
) {

public static NoteListGetServiceResponse of(List<NoteGetResponse> noteGetResponseList) {
Expand Down
Loading
Loading