Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(openchallenges): synchronize OC microservices with the API description #2354

Merged
merged 6 commits into from
Nov 14, 2023
Merged

fix(openchallenges): synchronize OC microservices with the API description #2354

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
364f953
sync-up-services
rrchai Nov 13, 2023
973f5f7
do not fix indentation
rrchai Nov 13, 2023
ed7184d
add missing updates
rrchai Nov 13, 2023
53be4f8
rm OpenApiGeneratorApplicationTests.java
rrchai Nov 13, 2023
682799b
Rename unit test file in challenge service
tschaffter Nov 14, 2023
3a49167
Prevent the generation of the test file
tschaffter Nov 14, 2023
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
1 change: 1 addition & 0 deletions apps/openchallenges/challenge-service/.openapi-generator-ignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,3 +26,4 @@ README.md
**/application.properties
**/model/dto/*AllOf*.java
**/OpenApiGeneratorApplication.java
**/OpenApiGeneratorApplicationTests.java
1 change: 0 additions & 1 deletion apps/openchallenges/challenge-service/.openapi-generator/FILES
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,4 +48,3 @@ src/main/java/org/sagebionetworks/openchallenges/challenge/service/model/dto/Pag
src/main/java/org/sagebionetworks/openchallenges/challenge/service/model/dto/SimpleChallengeInputDataTypeDto.java
src/main/java/org/sagebionetworks/openchallenges/challenge/service/model/dto/SimpleChallengePlatformDto.java
src/main/resources/openapi.yaml
src/test/java/org/sagebionetworks/openchallenges/challenge/service/OpenApiGeneratorApplicationTests.java
6 changes: 3 additions & 3 deletions ...ain/java/org/sagebionetworks/openchallenges/challenge/service/model/dto/ChallengeDto.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ public ChallengeDto slug(String slug) {
*/
@NotNull
@Pattern(regexp = "^[a-z0-9]+(?:-[a-z0-9]+)*$")
@Size(min = 3, max = 60)
@Size(min = 3, max = 255)
@Schema(
name = "slug",
example = "awesome-challenge",
Expand All @@ -146,7 +146,7 @@ public ChallengeDto name(String name) {
* @return name
*/
@NotNull
@Size(min = 3, max = 60)
@Size(min = 3, max = 255)
@Schema(name = "name", description = "The name of the challenge.", required = true)
public String getName() {
return name;
Expand Down Expand Up @@ -191,7 +191,7 @@ public ChallengeDto description(String description) {
* @return description
*/
@NotNull
@Size(min = 0, max = 280)
@Size(min = 0, max = 1000)
@Schema(
name = "description",
example = "This is an example description of the challenge.",
Expand Down
12 changes: 6 additions & 6 deletions apps/openchallenges/challenge-service/src/main/resources/openapi.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -560,13 +560,13 @@ components:
ChallengeSlug:
description: The slug of the challenge.
example: awesome-challenge
maxLength: 60
maxLength: 255
minLength: 3
pattern: "^[a-z0-9]+(?:-[a-z0-9]+)*$"
type: string
ChallengeName:
description: The name of the challenge.
maxLength: 60
maxLength: 255
minLength: 3
type: string
ChallengeHeadline:
Expand All @@ -578,7 +578,7 @@ components:
ChallengeDescription:
description: The description of the challenge.
example: This is an example description of the challenge.
maxLength: 280
maxLength: 1000
minLength: 0
type: string
ChallengePlatformId:
Expand Down Expand Up @@ -721,13 +721,13 @@ components:
slug:
description: The slug of the challenge.
example: awesome-challenge
maxLength: 60
maxLength: 255
minLength: 3
pattern: "^[a-z0-9]+(?:-[a-z0-9]+)*$"
type: string
name:
description: The name of the challenge.
maxLength: 60
maxLength: 255
minLength: 3
type: string
headline:
Expand All @@ -739,7 +739,7 @@ components:
description:
description: The description of the challenge.
example: This is an example description of the challenge.
maxLength: 280
maxLength: 1000
minLength: 0
type: string
doi:
Expand Down
2 changes: 1 addition & 1 deletion ...ice/OpenApiGeneratorApplicationTests.java → ...ice/ChallengeServiceApplicationTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import org.springframework.boot.test.context.SpringBootTest;

@SpringBootTest
class OpenApiGeneratorApplicationTests {
class ChallengeServiceApplicationTests {

@Test
void contextLoads() {}
Expand Down
1 change: 1 addition & 0 deletions ...java/org/sagebionetworks/openchallenges/organization/service/model/dto/BasicErrorDto.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
@Schema(name = "BasicError", description = "Problem details (tools.ietf.org/html/rfc7807)")
@JsonTypeName("BasicError")
@Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
@lombok.AllArgsConstructor
@lombok.Builder
public class BasicErrorDto {

Expand Down
1 change: 1 addition & 0 deletions apps/openchallenges/organization-service/src/main/resources/openapi.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -369,6 +369,7 @@ components:
- title
type: object
x-java-class-annotations:
- '@lombok.AllArgsConstructor'
- '@lombok.Builder'
OrganizationsPage_allOf:
properties:
Expand Down