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
5 changes: 4 additions & 1 deletion src/main/java/com/wooteco/wiki/admin/domain/Admin.java
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,10 @@ public class Admin {
protected Admin() {
}

public Admin(String loginId, String password) {
public Admin(
String loginId,
String password
) {
this.loginId = loginId;
this.password = password;
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
package com.wooteco.wiki.admin.domain.dto;

public record LoginRequest(String loginId, String password) {
public record LoginRequest(
String loginId,
String password
) {
}
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,8 @@

public interface AdminRepository extends JpaRepository<Admin, Long> {

Optional<Admin> findOneByLoginIdAndPassword(String loginId, String password);
Optional<Admin> findOneByLoginIdAndPassword(
String loginId,
String password
);
}
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,10 @@ public DocumentResponse getRandom() {
}

@Transactional
public DocumentResponse update(UUID uuid, DocumentUpdateRequest request) {
public DocumentResponse update(
UUID uuid,
DocumentUpdateRequest request
) {
CrewDocument crewDocument = crewDocumentRepository.findByUuid(uuid)
.orElseThrow(() -> new WikiException(ErrorCode.DOCUMENT_NOT_FOUND));

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,13 @@
@Getter
public class CrewDocument extends Document {

public CrewDocument(final String title, final String contents, final String writer,
final Long documentBytes, final UUID uuid) {
public CrewDocument(
final String title,
final String contents,
final String writer,
final Long documentBytes,
final UUID uuid
) {
super(title, contents, writer, documentBytes, uuid);
}

Expand Down
9 changes: 7 additions & 2 deletions src/main/java/com/wooteco/wiki/document/domain/Document.java
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,13 @@ public abstract class Document {
@Column(name = "dtype", insertable = false, updatable = false)
private DocumentType dtype;

public Document(final String title, final String contents, final String writer,
final Long documentBytes, final UUID uuid) {
public Document(
final String title,
final String contents,
final String writer,
final Long documentBytes,
final UUID uuid
) {
this.title = title;
this.contents = contents;
this.writer = writer;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,21 +7,21 @@
import java.util.UUID;

public record DocumentResponse(
Long documentId,
UUID documentUUID,
String title,
String contents,
String writer,
LocalDateTime generateTime,
Integer viewCount,
Long latestVersion,
List<OrganizationDocumentResponse> organizationDocumentResponses
Long documentId,
UUID documentUUID,
String title,
String contents,
String writer,
LocalDateTime generateTime,
Integer viewCount,
Long latestVersion,
List<OrganizationDocumentResponse> organizationDocumentResponses
) {

public static DocumentResponse toDocumentResponse(
CrewDocument crewDocument,
Long latestVersion,
List<OrganizationDocumentResponse> organizationDocumentResponses
CrewDocument crewDocument,
Long latestVersion,
List<OrganizationDocumentResponse> organizationDocumentResponses
) {
return new DocumentResponse(
crewDocument.getId(),
Expand All @@ -36,4 +36,3 @@ public static DocumentResponse toDocumentResponse(
);
}
}

Original file line number Diff line number Diff line change
Expand Up @@ -31,16 +31,21 @@ public List<OrganizationDocumentSearchResponse> searchOrganizationDocument(UUID
return toOrganizationDocumentTitleAndUuidResponses(organizationDocumentResponsesByDocument);
}

public void addOrganizationDocument(UUID documentUuid,
DocumentOrganizationMappingAddRequest documentOrganizationMappingAddRequest) {
public void addOrganizationDocument(
UUID documentUuid,
DocumentOrganizationMappingAddRequest documentOrganizationMappingAddRequest
) {
CrewDocument crewDocument = getCrewDocument(documentUuid);
OrganizationDocument organizationDocument = organizationDocumentRepository.save(
documentOrganizationMappingAddRequest.toOrganizationDocument());

documentOrganizationLinkService.link(crewDocument, organizationDocument);
}

public void deleteOrganizationDocument(UUID documentUuid, UUID organizationDocumentUuid) {
public void deleteOrganizationDocument(
UUID documentUuid,
UUID organizationDocumentUuid
) {
CrewDocument crewDocument = getCrewDocument(documentUuid);
OrganizationDocument organizationDocument = getOrganizationDocument(organizationDocumentUuid);

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
package com.wooteco.wiki.global.auth.domain.dto;

public record AuthTokensResponse(String accessToken, String refreshToken) {
public record AuthTokensResponse(
String accessToken,
String refreshToken
) {
}
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,15 @@
import com.wooteco.wiki.admin.domain.Admin;
import com.wooteco.wiki.global.auth.Role;

public record TokenInfoResponse (Long id, Role role) {
public record TokenInfoResponse(
Long id,
Role role
) {

public static TokenInfoResponse of(Admin admin, Role role) {
public static TokenInfoResponse of(
Admin admin,
Role role
) {
return new TokenInfoResponse(admin.getId(), role);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,10 @@ public class AuthService {
private final JwtTokenProvider jwtTokenProvider;
private final AdminRepository adminRepository;

public AuthService(JwtTokenProvider jwtTokenProvider, AdminRepository adminRepository) {
public AuthService(
JwtTokenProvider jwtTokenProvider,
AdminRepository adminRepository
) {
this.jwtTokenProvider = jwtTokenProvider;
this.adminRepository = adminRepository;
}
Expand Down
15 changes: 12 additions & 3 deletions src/main/java/com/wooteco/wiki/global/common/ApiResponse.java
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,22 @@

public class ApiResponse<B> extends ResponseEntity<B> {

public ApiResponse(B body, HttpStatus status) {
public ApiResponse(
B body,
HttpStatus status
) {
super(body, status);
}

public static record SuccessBody<D>(D data, SuccessCode code) {
public static record SuccessBody<D>(
D data,
SuccessCode code
) {
}

public static record FailureBody(ErrorCode code, String message) {
public static record FailureBody(
ErrorCode code,
String message
) {
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,22 @@ public static <D> ApiResponse<ApiResponse.SuccessBody<D>> success(D data) {
return new ApiResponse<>(new ApiResponse.SuccessBody<>(data, SuccessCode.SUCCESS), HttpStatus.OK);
}

public static <D> ApiResponse<ApiResponse.SuccessBody<D>> success(D data, HttpStatus status) {
public static <D> ApiResponse<ApiResponse.SuccessBody<D>> success(
D data,
HttpStatus status
) {
return new ApiResponse<>(new ApiResponse.SuccessBody<>(data, SuccessCode.SUCCESS), status);
}

public static ApiResponse<ApiResponse.SuccessBody<Void>> success(HttpStatus status) {
return new ApiResponse<>(new ApiResponse.SuccessBody<>(null, SuccessCode.SUCCESS), status);
}

public static ApiResponse<ApiResponse.FailureBody> failure(ErrorCode code, String message, HttpStatus status) {
public static ApiResponse<ApiResponse.FailureBody> failure(
ErrorCode code,
String message,
HttpStatus status
) {
return new ApiResponse<>(new ApiResponse.FailureBody(code, message), status);
}

Expand Down
12 changes: 10 additions & 2 deletions src/main/java/com/wooteco/wiki/global/common/PagedResponse.java
Original file line number Diff line number Diff line change
@@ -1,8 +1,16 @@
package com.wooteco.wiki.global.common;

public record PagedResponse<T> (int page, int totalPage, T data){
public record PagedResponse<T>(
int page,
int totalPage,
T data
) {

public static <T> PagedResponse<T> of(int page, int totalPage, T data) {
public static <T> PagedResponse<T> of(
int page,
int totalPage,
T data
) {
return new PagedResponse<>(page, totalPage, data);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,11 @@ public LoginCheckInterceptor(JwtTokenProvider jwtTokenProvider) {
}

@Override
public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) {
public boolean preHandle(
HttpServletRequest request,
HttpServletResponse response,
Object handler
) {
String token = extractTokenFromCookie(request);

if (token == null) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,12 @@ public boolean supportsParameter(MethodParameter parameter) {
}

@Override
public Object resolveArgument(MethodParameter parameter, ModelAndViewContainer mavContainer,
NativeWebRequest webRequest, WebDataBinderFactory binderFactory) throws Exception {
public Object resolveArgument(
MethodParameter parameter,
ModelAndViewContainer mavContainer,
NativeWebRequest webRequest,
WebDataBinderFactory binderFactory
) throws Exception {
return 1L;// 회원의 아이디 반환
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,10 @@ public class LoginMemberArgumentResolver implements HandlerMethodArgumentResolve
private final JwtTokenProvider jwtTokenProvider;
private final AuthService authService;

public LoginMemberArgumentResolver(JwtTokenProvider jwtTokenProvider, AuthService authService) {
public LoginMemberArgumentResolver(
JwtTokenProvider jwtTokenProvider,
AuthService authService
) {
this.jwtTokenProvider = jwtTokenProvider;
this.authService = authService;
}
Expand All @@ -31,10 +34,12 @@ public boolean supportsParameter(MethodParameter methodParameter) {
}

@Override
public Admin resolveArgument(MethodParameter methodParameter,
ModelAndViewContainer mavContainer,
NativeWebRequest nativeWebRequest,
WebDataBinderFactory binderFactory) {
public Admin resolveArgument(
MethodParameter methodParameter,
ModelAndViewContainer mavContainer,
NativeWebRequest nativeWebRequest,
WebDataBinderFactory binderFactory
) {
HttpServletRequest request = (HttpServletRequest) nativeWebRequest.getNativeRequest();

String token = extractTokenFromCookie(request);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,10 @@ public enum ErrorCode {
private final String message;
private final HttpStatus httpStatus;

ErrorCode(String message, HttpStatus httpStatus) {
ErrorCode(
String message,
HttpStatus httpStatus
) {
this.message = message;
this.httpStatus = httpStatus;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,10 @@ public enum SuccessCode {
private final String message;
private final HttpStatus httpStatus;

SuccessCode(String message, HttpStatus httpStatus) {
SuccessCode(
String message,
HttpStatus httpStatus
) {
this.message = message;
this.httpStatus = httpStatus;
}
Expand Down
11 changes: 9 additions & 2 deletions src/main/java/com/wooteco/wiki/history/domain/History.java
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,15 @@ public class History {
protected History() {
}

public History(String title, String contents, String writer, Long documentBytes, LocalDateTime generateTime,
Document document, Long version) {
public History(
String title,
String contents,
String writer,
Long documentBytes,
LocalDateTime generateTime,
Document document,
Long version
) {
this.title = title;
this.contents = contents;
this.writer = writer;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,11 @@

import java.time.LocalDateTime;

public record HistoryDetailResponse(Long logId, String title, String contents, String writer,
LocalDateTime generateTime) {
public record HistoryDetailResponse(
Long logId,
String title,
String contents,
String writer,
LocalDateTime generateTime
) {
}
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,14 @@
import com.wooteco.wiki.history.domain.History;
import java.time.LocalDateTime;

public record HistoryResponse(Long id, String title, Long version, String writer, Long documentBytes,
LocalDateTime generateTime) {
public record HistoryResponse(
Long id,
String title,
Long version,
String writer,
Long documentBytes,
LocalDateTime generateTime
) {

public static HistoryResponse of(History history) {
return new HistoryResponse(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,10 @@
public interface HistoryRepository extends JpaRepository<History, Long> {

@Query("SELECT h FROM History h WHERE h.document.id = :documentId")
Page<History> findAllByDocumentId(Long documentId, Pageable pageable);
Page<History> findAllByDocumentId(
Long documentId,
Pageable pageable
);

@Query("SELECT MAX(h.version) FROM History h WHERE h.document.id = :documentId")
Optional<Long> findMaxVersionByDocumentId(@Param("documentId") Long documentId);
Expand Down
Loading
Loading