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
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.moplus.moplus_server.domain.problem.dto.response;

public record PresignedUrlResponse(
String data
String presignedUrl
) {
public static PresignedUrlResponse of(String presignedUrl) {
return new PresignedUrlResponse(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,20 @@
import com.moplus.moplus_server.global.properties.swagger.SwaggerProperties;
import io.swagger.v3.oas.models.Components;
import io.swagger.v3.oas.models.OpenAPI;
import io.swagger.v3.oas.models.Operation;
import io.swagger.v3.oas.models.info.Info;
import io.swagger.v3.oas.models.media.Content;
import io.swagger.v3.oas.models.media.Schema;
import io.swagger.v3.oas.models.security.SecurityRequirement;
import io.swagger.v3.oas.models.security.SecurityScheme;
import io.swagger.v3.oas.models.servers.Server;
import java.util.List;
import java.util.stream.Collectors;
import lombok.RequiredArgsConstructor;
import org.springdoc.core.customizers.OperationCustomizer;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.http.HttpStatus;

@Configuration
@RequiredArgsConstructor
Expand Down Expand Up @@ -43,4 +48,33 @@ public OpenAPI openAPI() {
.version("v0.0.1"))
.servers(addServerUrl());
}

@Bean
public OperationCustomizer operationCustomizer() {
return (operation, handlerMethod) -> {
this.addResponseBodyWrapperSchemaExample(operation);
return operation;
};
}

private void addResponseBodyWrapperSchemaExample(Operation operation) {
final Content content = operation.getResponses().get("200").getContent();
if (content != null) {
content.forEach((mediaTypeKey, mediaType) -> {
Schema<?> originalSchema = mediaType.getSchema();
Schema<?> wrappedSchema = wrapSchema(originalSchema);
mediaType.setSchema(wrappedSchema);
});
}
}

private Schema<?> wrapSchema(Schema<?> originalSchema) {
final Schema<?> wrapperSchema = new Schema<>();

wrapperSchema.addProperty("data", originalSchema);
wrapperSchema.addProperty("message", new Schema<>().type("string").example("오류 메세지"));
wrapperSchema.addProperty("status", new Schema<>().type("string").example(HttpStatus.NOT_FOUND.name()));

return wrapperSchema;
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
package com.moplus.moplus_server.global.response;

import com.fasterxml.jackson.annotation.JsonInclude;
import com.moplus.moplus_server.global.error.ErrorResponse;
import org.springframework.http.HttpStatus;

@JsonInclude(JsonInclude.Include.NON_NULL)
public record ResponseDto<T>(
T data,
String message,
HttpStatus status
) {
public static <T> ResponseDto<T> success(final T data) {
return new ResponseDto<>(data, null, null);
}

public static <T> ResponseDto<T> fail(ErrorResponse errorResponse) {
return new ResponseDto<>(null, errorResponse.getMessage(), errorResponse.getStatus());
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
package com.moplus.moplus_server.global.response;

import com.moplus.moplus_server.global.error.ErrorResponse;
import org.springframework.core.MethodParameter;
import org.springframework.http.MediaType;
import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
import org.springframework.http.server.ServerHttpRequest;
import org.springframework.http.server.ServerHttpResponse;
import org.springframework.web.bind.annotation.RestControllerAdvice;
import org.springframework.web.servlet.mvc.method.annotation.ResponseBodyAdvice;

@RestControllerAdvice(
basePackages = "com.moplus.moplus_server"
)

public class ResponseDtoAdvice implements ResponseBodyAdvice<Object> {

@Override
public boolean supports(MethodParameter returnType, Class converterType) {
return !(returnType.getParameterType() == ResponseDto.class)
&& MappingJackson2HttpMessageConverter.class.isAssignableFrom(converterType);
}

@Override
public Object beforeBodyWrite(
Object body,
MethodParameter returnType,
MediaType selectedContentType,
Class selectedConverterType,
ServerHttpRequest request,
ServerHttpResponse response
) {
if (body instanceof ErrorResponse) {
return ResponseDto.fail((ErrorResponse) body);
}
return ResponseDto.success(body);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -70,9 +70,9 @@ public void setMockMvc() throws Exception {
.contentType("application/json")
.header(HttpHeaders.AUTHORIZATION, "Bearer " + validToken))
.andExpect(status().isOk()) // 200 응답 확인
.andExpect(jsonPath("$.id").exists()) // MemberGetResponse의 필드 확인
.andExpect(jsonPath("$.name").exists())
.andExpect(jsonPath("$.email").exists());
.andExpect(jsonPath("$.data.id").exists()) // MemberGetResponse의 필드 확인
.andExpect(jsonPath("$.data.name").exists())
.andExpect(jsonPath("$.data.email").exists());
}
}
}