Skip to content

feat(ProjectMetadata): Add discipline field #297

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

Closed
hirokiterashima wants to merge 2 commits into from
Closed

feat(ProjectMetadata): Add discipline field #297

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a0986cc
feat(ProjectMetadata): Add discipline field
hirokiterashima Apr 7, 2025
11a0722
Remove file. Accidental commit
hirokiterashima Apr 8, 2025
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
17 changes: 17 additions & 0 deletions src/main/java/org/wise/portal/domain/project/impl/ProjectMetadataImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,6 +204,10 @@ public class ProjectMetadataImpl implements ProjectMetadata, Serializable {
@Setter
private String researchProjects;

@Getter
@Setter
private String disciplines;

public ProjectMetadataImpl() {
}

Expand Down Expand Up @@ -246,6 +250,12 @@ public void populateFromJSON(JSONObject metadataJSON) {
}
setResearchProjects(researchProjects.toString());

JSONArray disciplines = metadataJSON.optJSONArray("disciplines");
if (disciplines == null) {
disciplines = new JSONArray();
}
setDisciplines(disciplines.toString());

JSONArray parentProjects = metadataJSON.optJSONArray("parentProjects");
if (parentProjects == null) {
parentProjects = new JSONArray();
Expand Down Expand Up @@ -479,6 +489,13 @@ public String toJSONString() {
metadata.put("researchProjects", new JSONArray());
}

String disciplinesString = metadata.getString("disciplines");
if (disciplinesString != null && disciplinesString != "null") {
JSONArray disciplinesJSON = new JSONArray(disciplinesString);
metadata.put("disciplines", disciplinesJSON);
} else {
metadata.put("disciplines", new JSONArray());
}
} catch (JSONException e) {
e.printStackTrace();
}
Expand Down