Skip to content

Commit c4a59e4

Browse files
feat(ProjectMetadata): Add researchProjects field (#284)
1 parent 51cac64 commit c4a59e4

File tree

1 file changed

+25
-4
lines changed

1 file changed

+25
-4
lines changed

src/main/java/org/wise/portal/domain/project/impl/ProjectMetadataImpl.java

Lines changed: 25 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ public class ProjectMetadataImpl implements ProjectMetadata, Serializable {
125125
@Column(name = "tools", length = 32768, columnDefinition = "text")
126126
@Getter
127127
@Setter
128-
private String tools; // text (blob) 2^15
128+
private String tools; // text (blob) 2^15
129129

130130
@Column(name = "lesson_plan", length = 5120000, columnDefinition = "mediumtext")
131131
@Getter
@@ -200,6 +200,10 @@ public class ProjectMetadataImpl implements ProjectMetadata, Serializable {
200200
@Setter
201201
private String navMode;
202202

203+
@Getter
204+
@Setter
205+
private String researchProjects;
206+
203207
public ProjectMetadataImpl() {
204208
}
205209

@@ -236,6 +240,12 @@ public void populateFromJSON(JSONObject metadataJSON) {
236240
}
237241
setAuthors(authors.toString());
238242

243+
JSONArray researchProjects = metadataJSON.optJSONArray("researchProjects");
244+
if (researchProjects == null) {
245+
researchProjects = new JSONArray();
246+
}
247+
setResearchProjects(researchProjects.toString());
248+
239249
JSONArray parentProjects = metadataJSON.optJSONArray("parentProjects");
240250
if (parentProjects == null) {
241251
parentProjects = new JSONArray();
@@ -372,7 +382,8 @@ public String getTechDetailsString() {
372382
if (techReqs != null && !techReqs.equals("") && !techReqs.equals("null")) {
373383
try {
374384
JSONObject techReqsJSON = new JSONObject(techReqs);
375-
if (techReqsJSON.has("java") && (techReqsJSON.getString("java").equals("checked") || techReqsJSON.getString("java").equals("true"))) {
385+
if (techReqsJSON.has("java") && (techReqsJSON.getString("java").equals("checked")
386+
|| techReqsJSON.getString("java").equals("true"))) {
376387
techReqsAndDetailsStringBuf.append("Java");
377388
}
378389

@@ -383,14 +394,16 @@ public String getTechDetailsString() {
383394
techReqsAndDetailsStringBuf.append("Flash");
384395
}
385396

386-
if (techReqsJSON.has("quickTime") && (techReqsJSON.getString("quickTime").equals("checked") || techReqsJSON.getString("quickTime").equals("true"))) {
397+
if (techReqsJSON.has("quickTime") && (techReqsJSON.getString("quickTime").equals("checked")
398+
|| techReqsJSON.getString("quickTime").equals("true"))) {
387399
if (techReqsAndDetailsStringBuf.length() != 0) {
388400
techReqsAndDetailsStringBuf.append(", ");
389401
}
390402
techReqsAndDetailsStringBuf.append("QuickTime");
391403
}
392404

393-
if (techReqsJSON.has("techDetails") && techReqsJSON.getString("techDetails") != null && !techReqsJSON.getString("techDetails").equals("")) {
405+
if (techReqsJSON.has("techDetails") && techReqsJSON.getString("techDetails") != null
406+
&& !techReqsJSON.getString("techDetails").equals("")) {
394407
if (techReqsAndDetailsStringBuf.length() != 0) {
395408
techReqsAndDetailsStringBuf.append(", ");
396409
}
@@ -458,6 +471,14 @@ public String toJSONString() {
458471
metadata.put("parentProjects", new JSONArray());
459472
}
460473

474+
String researchProjectsString = metadata.getString("researchProjects");
475+
if (researchProjectsString != null && researchProjectsString != "null") {
476+
JSONArray researchProjectsJSON = new JSONArray(researchProjectsString);
477+
metadata.put("researchProjects", researchProjectsJSON);
478+
} else {
479+
metadata.put("researchProjects", new JSONArray());
480+
}
481+
461482
} catch (JSONException e) {
462483
e.printStackTrace();
463484
}

0 commit comments

Comments
 (0)