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

feat(openchallenges): add new operation property to Challenge schema #2264

Closed
wants to merge 17 commits into from
Closed

feat(openchallenges): add new operation property to Challenge schema #2264

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
da7fc39
add `operation` column to `challenge` table
vpchung Oct 21, 2023
64d4d3e
add `operation` to the API specs
vpchung Oct 21, 2023
9e1ac3d
Merge branch 'main' into task-2256-operation
vpchung Oct 25, 2023
2e75b66
reduce max char to 16
vpchung Oct 25, 2023
142e5f5
accept NULL as possible value
vpchung Oct 25, 2023
667e3b9
update openapi specs
vpchung Oct 25, 2023
5527e99
Merge branch 'main' into task-2256-operation
vpchung Feb 17, 2024
5174865
add latest challenge data with `operation` column
vpchung Feb 17, 2024
e7bdf54
update script that dumps db csv files to include `operation`
vpchung Feb 17, 2024
00c4924
update openapi specs
vpchung Feb 17, 2024
8f1367d
use `operation_id` instead of `operation`
vpchung Feb 17, 2024
d6da0fa
prepare to display operation on profile
vpchung Feb 17, 2024
2dfe5a4
remove extra whitespace
vpchung Feb 17, 2024
4dfea92
Merge branch 'main' into task-2256-operation
vpchung Feb 19, 2024
1cbcb58
update java files + openAPI spec
vpchung Feb 20, 2024
fecf499
update angular API client
vpchung Feb 20, 2024
0232f3e
uncomment HTML code
vpchung Feb 20, 2024
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
560 changes: 280 additions & 280 deletions apps/openchallenges/challenge-service/src/main/resources/db/challenges.csv
View file
Open in desktop

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions ...penchallenges/challenge-service/src/main/resources/db/migration/V1.0.0__create_tables.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ CREATE TABLE `challenge`
`difficulty` ENUM('good_for_beginners', 'intermediate', 'advanced'),
`platform_id` int,
`doi` varchar(80),
`operation` varchar(80),
vpchung marked this conversation as resolved.
Show resolved Hide resolved
`start_date` DATE,
`end_date` DATE,
-- `email` varchar(255) DEFAULT NULL,
Expand Down
8 changes: 8 additions & 0 deletions libs/openchallenges/api-description/build/challenge.openapi.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -392,6 +392,12 @@ components:
minLength: 0
maxLength: 280
example: This is an example description of the challenge.
ChallengeOperation:
description: The EDAM operation class of the challenge.
type: string
maxLength: 80
pattern: ^$|^operation_\d+$
example: operation_0004
ChallengePlatformId:
description: The unique identifier of a challenge platform.
type: integer
Expand Down Expand Up @@ -473,6 +479,8 @@ components:
$ref: '#/components/schemas/ChallengeDescription'
doi:
type: string
operation:
$ref: '#/components/schemas/ChallengeOperation'
status:
$ref: '#/components/schemas/ChallengeStatus'
difficulty:
Expand Down
8 changes: 8 additions & 0 deletions libs/openchallenges/api-description/build/openapi.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -544,6 +544,12 @@ components:
minLength: 0
maxLength: 280
example: This is an example description of the challenge.
ChallengeOperation:
description: The EDAM operation class of the challenge.
type: string
maxLength: 80
pattern: ^$|^operation_\d+$
example: operation_0004
ChallengePlatformId:
description: The unique identifier of a challenge platform.
type: integer
Expand Down Expand Up @@ -625,6 +631,8 @@ components:
$ref: '#/components/schemas/ChallengeDescription'
doi:
type: string
operation:
$ref: '#/components/schemas/ChallengeOperation'
status:
$ref: '#/components/schemas/ChallengeStatus'
difficulty:
Expand Down
2 changes: 2 additions & 0 deletions libs/openchallenges/api-description/src/components/schemas/Challenge.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ properties:
$ref: ChallengeDescription.yaml
doi:
type: string
operation:
$ref: ChallengeOperation.yaml
status:
$ref: ChallengeStatus.yaml
difficulty:
Expand Down
5 changes: 5 additions & 0 deletions libs/openchallenges/api-description/src/components/schemas/ChallengeOperation.yaml
View file
Open in desktop
vpchung marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
description: The EDAM operation class of the challenge.
type: string
maxLength: 80
vpchung marked this conversation as resolved.
Show resolved Hide resolved
pattern: '^$|^operation_\d+$'
example: operation_0004