Skip to content

Commit b929a23

Browse files
committed
[fix/#36] swagger 서버 url 선택 가능하게 수정
1 parent 9d2dfa3 commit b929a23

File tree

10 files changed

+165
-4
lines changed

10 files changed

+165
-4
lines changed

src/main/generated/com/moplus/moplus_server/domain/problem/service/mapper/ChildProblemMapperImpl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
@Generated(
1212
value = "org.mapstruct.ap.MappingProcessor",
13-
date = "2025-01-31T02:55:57+0900",
13+
date = "2025-02-08T16:27:45+0900",
1414
comments = "version: 1.6.3, compiler: javac, environment: Java 17.0.10 (JetBrains s.r.o.)"
1515
)
1616
@Component

src/main/generated/com/moplus/moplus_server/domain/problem/service/mapper/ProblemMapperImpl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
@Generated(
1414
value = "org.mapstruct.ap.MappingProcessor",
15-
date = "2025-01-31T02:55:56+0900",
15+
date = "2025-02-08T16:27:45+0900",
1616
comments = "version: 1.6.3, compiler: javac, environment: Java 17.0.10 (JetBrains s.r.o.)"
1717
)
1818
@Component
Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
package com.moplus.moplus_server.domain.problemset.domain;
2+
3+
import static com.querydsl.core.types.PathMetadataFactory.*;
4+
5+
import com.querydsl.core.types.dsl.*;
6+
7+
import com.querydsl.core.types.PathMetadata;
8+
import javax.annotation.processing.Generated;
9+
import com.querydsl.core.types.Path;
10+
import com.querydsl.core.types.dsl.PathInits;
11+
12+
13+
/**
14+
* QProblemSet is a Querydsl query type for ProblemSet
15+
*/
16+
@Generated("com.querydsl.codegen.DefaultEntitySerializer")
17+
public class QProblemSet extends EntityPathBase<ProblemSet> {
18+
19+
private static final long serialVersionUID = -499971265L;
20+
21+
public static final QProblemSet problemSet = new QProblemSet("problemSet");
22+
23+
public final com.moplus.moplus_server.global.common.QBaseEntity _super = new com.moplus.moplus_server.global.common.QBaseEntity(this);
24+
25+
public final EnumPath<ProblemSetConfirmStatus> confirmStatus = createEnum("confirmStatus", ProblemSetConfirmStatus.class);
26+
27+
//inherited
28+
public final DateTimePath<java.time.LocalDateTime> createdDate = _super.createdDate;
29+
30+
public final NumberPath<Long> id = createNumber("id", Long.class);
31+
32+
public final BooleanPath isDeleted = createBoolean("isDeleted");
33+
34+
public final StringPath name = createString("name");
35+
36+
public final ListPath<com.moplus.moplus_server.domain.problem.domain.problem.ProblemId, com.moplus.moplus_server.domain.problem.domain.problem.QProblemId> problemIds = this.<com.moplus.moplus_server.domain.problem.domain.problem.ProblemId, com.moplus.moplus_server.domain.problem.domain.problem.QProblemId>createList("problemIds", com.moplus.moplus_server.domain.problem.domain.problem.ProblemId.class, com.moplus.moplus_server.domain.problem.domain.problem.QProblemId.class, PathInits.DIRECT2);
37+
38+
//inherited
39+
public final DateTimePath<java.time.LocalDateTime> updatedDate = _super.updatedDate;
40+
41+
public QProblemSet(String variable) {
42+
super(ProblemSet.class, forVariable(variable));
43+
}
44+
45+
public QProblemSet(Path<? extends ProblemSet> path) {
46+
super(path.getType(), path.getMetadata());
47+
}
48+
49+
public QProblemSet(PathMetadata metadata) {
50+
super(ProblemSet.class, metadata);
51+
}
52+
53+
}
54+
Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
package com.moplus.moplus_server.domain.publish.domain;
2+
3+
import static com.querydsl.core.types.PathMetadataFactory.*;
4+
5+
import com.querydsl.core.types.dsl.*;
6+
7+
import com.querydsl.core.types.PathMetadata;
8+
import javax.annotation.processing.Generated;
9+
import com.querydsl.core.types.Path;
10+
11+
12+
/**
13+
* QPublish is a Querydsl query type for Publish
14+
*/
15+
@Generated("com.querydsl.codegen.DefaultEntitySerializer")
16+
public class QPublish extends EntityPathBase<Publish> {
17+
18+
private static final long serialVersionUID = 1565569153L;
19+
20+
public static final QPublish publish = new QPublish("publish");
21+
22+
public final com.moplus.moplus_server.global.common.QBaseEntity _super = new com.moplus.moplus_server.global.common.QBaseEntity(this);
23+
24+
//inherited
25+
public final DateTimePath<java.time.LocalDateTime> createdDate = _super.createdDate;
26+
27+
public final NumberPath<Long> id = createNumber("id", Long.class);
28+
29+
public final NumberPath<Long> problemSetId = createNumber("problemSetId", Long.class);
30+
31+
public final DatePath<java.time.LocalDate> publishedDate = createDate("publishedDate", java.time.LocalDate.class);
32+
33+
//inherited
34+
public final DateTimePath<java.time.LocalDateTime> updatedDate = _super.updatedDate;
35+
36+
public QPublish(String variable) {
37+
super(Publish.class, forVariable(variable));
38+
}
39+
40+
public QPublish(Path<? extends Publish> path) {
41+
super(path.getType(), path.getMetadata());
42+
}
43+
44+
public QPublish(PathMetadata metadata) {
45+
super(Publish.class, metadata);
46+
}
47+
48+
}
49+

src/main/java/com/moplus/moplus_server/global/config/properties/PropertiesConfig.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
package com.moplus.moplus_server.global.config.properties;
22

33
import com.moplus.moplus_server.global.properties.jwt.JwtProperties;
4+
import com.moplus.moplus_server.global.properties.swagger.SwaggerProperties;
45
import org.springframework.boot.context.properties.EnableConfigurationProperties;
56
import org.springframework.context.annotation.Configuration;
67

78
@EnableConfigurationProperties({
8-
JwtProperties.class
9+
JwtProperties.class,
10+
SwaggerProperties.class
911
})
1012
@Configuration
1113
public class PropertiesConfig {
Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,46 @@
11
package com.moplus.moplus_server.global.config.swagger;
22

3+
import com.moplus.moplus_server.global.properties.swagger.SwaggerProperties;
34
import io.swagger.v3.oas.models.Components;
45
import io.swagger.v3.oas.models.OpenAPI;
56
import io.swagger.v3.oas.models.info.Info;
67
import io.swagger.v3.oas.models.security.SecurityRequirement;
78
import io.swagger.v3.oas.models.security.SecurityScheme;
9+
import io.swagger.v3.oas.models.servers.Server;
10+
import java.util.List;
11+
import java.util.stream.Collectors;
12+
import lombok.RequiredArgsConstructor;
813
import org.springframework.context.annotation.Bean;
914
import org.springframework.context.annotation.Configuration;
1015

1116
@Configuration
17+
@RequiredArgsConstructor
1218
public class SwaggerConfig {
1319

20+
private final SwaggerProperties swaggerProperties;
21+
1422
private SecurityScheme createAPIKeyScheme() {
1523
return new SecurityScheme().type(SecurityScheme.Type.HTTP)
1624
.bearerFormat("JWT")
1725
.scheme("Bearer");
1826
}
1927

28+
private List<Server> addServerUrl() {
29+
return swaggerProperties.servers().stream()
30+
.map(serverProp -> new Server()
31+
.url(serverProp.url())
32+
.description(serverProp.description()))
33+
.collect(Collectors.toList());
34+
}
35+
2036
@Bean
2137
public OpenAPI openAPI() {
38+
2239
return new OpenAPI().addSecurityItem(new SecurityRequirement().addList("JWT"))
2340
.components(new Components().addSecuritySchemes("JWT", createAPIKeyScheme()))
2441
.info(new Info().title("모플 API 명세서")
2542
.description("모플 API 명세서 입니다")
26-
.version("v0.0.1"));
43+
.version("v0.0.1"))
44+
.servers(addServerUrl());
2745
}
2846
}
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
package com.moplus.moplus_server.global.properties.swagger;
2+
3+
import java.util.List;
4+
import org.springframework.boot.context.properties.ConfigurationProperties;
5+
6+
@ConfigurationProperties(prefix = "swagger")
7+
public record SwaggerProperties(
8+
List<ServerProperties> servers
9+
) {
10+
public static record ServerProperties(
11+
String url,
12+
String description
13+
) {
14+
}
15+
}

src/main/resources/application-dev.yml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,15 @@ spring:
2020
connection-timeout: 3000 # 30 seconds in milliseconds
2121
keepalive-time: 600000 # 5 minutes in milliseconds
2222

23+
swagger:
24+
servers:
25+
- url: https://dev.mopl.kr
26+
description: "mopl dev https 서버입니다."
27+
- url: http://dev.mopl.kr
28+
description: "mopl dev http 서버입니다."
29+
- url: http://localhost:8080
30+
description: "mopl local 서버입니다."
31+
2332
logging:
2433
level:
2534
root: ERROR

src/main/resources/application-local.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,8 @@ spring:
1010
use_sql_comments: true
1111
hibernate:
1212
ddl-auto: update
13+
14+
swagger:
15+
servers:
16+
- url: http://localhost:8080
17+
description: "mopl local 서버입니다."

src/main/resources/application-prod.yml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,15 @@ spring:
1515
connection-timeout: 3000 # 30 seconds in milliseconds
1616
keepalive-time: 600000 # 5 minutes in milliseconds
1717

18+
swagger:
19+
servers:
20+
- url: https://prod.mopl.kr
21+
description: "mopl prod https 서버입니다."
22+
- url: http://prod.mopl.kr
23+
description: "mopl prod http 서버입니다."
24+
- url: http://localhost:8080
25+
description: "mopl local 서버입니다."
26+
1827
logging:
1928
level:
2029
root: ERROR

0 commit comments

Comments
 (0)