Skip to content

[ENG-8455] Added academiaInstitution in social-schema, fixed True value for ongoing #11239

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

Merged
brianjgeiger merged 1 commit into from
Jul 24, 2025
Merged

[ENG-8455] Added academiaInstitution in social-schema, fixed True value for ongoing #11239

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
32 changes: 19 additions & 13 deletions api/base/schemas/education-schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,18 +25,6 @@
"minimum": 1900
},
"ongoing": {
"oneOf": [{
"enum": [false],
"required": ["startYear", "endYear"]
},
{
"enum": [true],
"required": ["startYear"],
"not": {
"required": ["endYear"]
}
}
],
"type": "boolean"
},
"department": {
Expand All @@ -56,7 +44,25 @@
"startMonth": ["startYear"],
"startYear": ["ongoing"],
"endYear": ["ongoing"],
"endYear": ["startYear"]
"endYear": ["startYear"],
"ongoing": {
"if": {
"properties": {
"ongoing": {
"const": false
}
}
},
"then": {
"required": ["startYear", "endYear"]
},
"else": {
"required": ["startYear"],
"not": {
"required": ["endYear"]
}
}
}
}
}
}
32 changes: 19 additions & 13 deletions api/base/schemas/employment-schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,18 +25,6 @@
"minimum": 1900
},
"ongoing": {
"oneOf": [{
"enum": [false],
"required": ["startYear", "endYear"]
},
{
"enum": [true],
"required": ["startYear"],
"not": {
"required": ["endYear"]
}
}
],
"type": "boolean"
},
"department": {
Expand All @@ -56,7 +44,25 @@
"startMonth": ["startYear"],
"startYear": ["ongoing"],
"endYear": ["ongoing"],
"endYear": ["startYear"]
"endYear": ["startYear"],
"ongoing": {
"if": {
"properties": {
"ongoing": {
"const": false
}
}
},
"then": {
"required": ["startYear", "endYear"]
},
"else": {
"required": ["startYear"],
"not": {
"required": ["endYear"]
}
}
}
}
}
}
4 changes: 4 additions & 0 deletions api/base/schemas/social-schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,10 @@
"description": "The academiaProfileID for the given user",
"type": "string"
},
"academiaInstitution": {
"description": "The academiaInstitution for the given user",
"type": "string"
},
"orcid": {
"description": "The orcid for the given user",
"type": "string"
Expand Down
54 changes: 36 additions & 18 deletions api_tests/users/views/test_user_detail.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -935,7 +935,8 @@ def test_patch_all_social_fields(self, app, user_one, url_user_one, mock_spam_he
'impactStory': 'why not',
'orcid': 'ork-id',
'researchGate': 'Why are there so many of these',
'researcherId': 'ok-lastone'
'researcherId': 'ok-lastone',
'academiaInstitution': 'Center for Open Science'
}

fake_fields = {
Expand Down Expand Up @@ -1354,30 +1355,47 @@ def test_user_put_profile_date_validate_end_date(self, app, user_one, user_one_u
assert res.status_code == 400
assert res.json['errors'][0]['detail'] == 'End date must be greater than or equal to the start date.'

def test_user_put_profile_date_validate_end_month_dependency(self, app, user_one, user_one_url, end_month_dependency_payload):
# No endMonth with endYear
res = app.put_json_api(user_one_url, end_month_dependency_payload, auth=user_one.auth, expect_errors=True)
def test_user_put_profile_date_validate_end_month_dependency_ongoing(self, app, user_one, user_attr, user_one_url, start_dates_no_end_dates_payload, request_key):
# End dates, but no start dates
start_dates_no_end_dates_payload['data']['attributes'][request_key][0]['ongoing'] = True
start_dates_no_end_dates_payload['data']['attributes'][request_key][0]['endMonth'] = 3

res = app.put_json_api(user_one_url, start_dates_no_end_dates_payload, auth=user_one.auth, expect_errors=True)
user_one.reload()
assert res.status_code == 400
assert res.json['errors'][0]['detail'] == "'endYear' is a dependency of 'endMonth'"

def test_user_put_profile_date_validate_start_month_dependency(self, app, user_one, user_one_url, start_month_dependency_payload):
# No endMonth with endYear
res = app.put_json_api(user_one_url, start_month_dependency_payload, auth=user_one.auth, expect_errors=True)
assert res.status_code == 400
assert res.json['errors'][0]['detail'] == "'startYear' is a dependency of 'startMonth'"
def test_false_ongoing_without_start_date_should_fail(self, app, request_payload, user_one_url, user_one, request_key, user_attr):
request_payload['data']['attributes'][request_key][0].pop('startYear')
res = app.put_json_api(user_one_url, request_payload, auth=user_one.auth, expect_errors=True)
user_one.reload()
assert res.json['errors'][0]['detail'] == "'startYear' is a required property"
assert not getattr(user_one, user_attr)

def test_user_put_profile_date_validate_start_date_no_end_date_not_ongoing(self, app, user_one, user_attr, user_one_url, start_dates_no_end_dates_payload, request_key):
# End date is greater then start date
res = app.put_json_api(user_one_url, start_dates_no_end_dates_payload, auth=user_one.auth, expect_errors=True)
def test_false_ongoing_without_end_date_should_fail(self, app, request_payload, user_one_url, user_one, request_key, user_attr):
request_payload['data']['attributes'][request_key][0].pop('endYear')
res = app.put_json_api(user_one_url, request_payload, auth=user_one.auth, expect_errors=True)
user_one.reload()
assert res.status_code == 400
assert res.json['errors'][0]['detail'] == "'endYear' is a required property"
assert not getattr(user_one, user_attr)

def test_user_put_profile_date_validate_end_date_no_start_date(self, app, user_one, user_attr, user_one_url, end_dates_no_start_dates_payload, request_key):
# End dates, but no start dates
res = app.put_json_api(user_one_url, end_dates_no_start_dates_payload, auth=user_one.auth, expect_errors=True)
def test_true_ongoing_without_start_date_should_fail(self, app, request_payload, user_one_url, user_one, request_key, user_attr):
request_payload['data']['attributes'][request_key][0].pop('startYear')
res = app.put_json_api(user_one_url, request_payload, auth=user_one.auth, expect_errors=True)
user_one.reload()
assert res.status_code == 400
assert res.json['errors'][0]['detail'] == "'startYear' is a dependency of 'endYear'"
assert res.json['errors'][0]['detail'] == "'startYear' is a required property"
assert not getattr(user_one, user_attr)

def test_true_ongoing_without_end_date_should_succeed(self, app, request_payload, user_one_url, user_one, request_key, user_attr):
request_payload['data']['attributes'][request_key][0]['ongoing'] = True
request_payload['data']['attributes'][request_key][0].pop('endYear')
# to avoid dependency error
request_payload['data']['attributes'][request_key][0].pop('endMonth')

res = app.put_json_api(user_one_url, request_payload, auth=user_one.auth, expect_errors=True)
user_one.reload()
assert res.status_code == 200
assert getattr(user_one, user_attr)[0]['startYear'] == request_payload['data']['attributes'][request_key][0]['startYear']


@pytest.mark.django_db
Expand Down
Loading
⚡