From 216fb781e646195ccef3385f6f5ce08a77f21b70 Mon Sep 17 00:00:00 2001 From: Hiroki Terashima Date: Mon, 31 Mar 2025 16:53:55 -0700 Subject: [PATCH 1/3] feat(ProjectMetadata): Save and retrieve resources --- .../project/impl/ProjectMetadataImpl.java | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/src/main/java/org/wise/portal/domain/project/impl/ProjectMetadataImpl.java b/src/main/java/org/wise/portal/domain/project/impl/ProjectMetadataImpl.java index 84dd36156..741617195 100644 --- a/src/main/java/org/wise/portal/domain/project/impl/ProjectMetadataImpl.java +++ b/src/main/java/org/wise/portal/domain/project/impl/ProjectMetadataImpl.java @@ -204,6 +204,10 @@ public class ProjectMetadataImpl implements ProjectMetadata, Serializable { @Setter private String researchProjects; + @Getter + @Setter + private String resources; + public ProjectMetadataImpl() { } @@ -246,6 +250,12 @@ public void populateFromJSON(JSONObject metadataJSON) { } setResearchProjects(researchProjects.toString()); + JSONArray resources = metadataJSON.optJSONArray("resources"); + if (resources == null) { + resources = new JSONArray(); + } + setResources(resources.toString()); + JSONArray parentProjects = metadataJSON.optJSONArray("parentProjects"); if (parentProjects == null) { parentProjects = new JSONArray(); @@ -479,6 +489,13 @@ public String toJSONString() { metadata.put("researchProjects", new JSONArray()); } + String resourcesString = metadata.getString("resources"); + if (resourcesString != null && resourcesString != "null") { + JSONArray resourcesJSON = new JSONArray(resourcesString); + metadata.put("resources", resourcesJSON); + } else { + metadata.put("resources", new JSONArray()); + } } catch (JSONException e) { e.printStackTrace(); } From 5d1b9c3fb7d38b65ab5a1500285e07223a9cc0b1 Mon Sep 17 00:00:00 2001 From: Hiroki Terashima Date: Mon, 7 Apr 2025 15:29:28 -0700 Subject: [PATCH 2/3] Add unitType field to metadata --- .../portal/domain/project/impl/ProjectMetadataImpl.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/main/java/org/wise/portal/domain/project/impl/ProjectMetadataImpl.java b/src/main/java/org/wise/portal/domain/project/impl/ProjectMetadataImpl.java index 741617195..52def3637 100644 --- a/src/main/java/org/wise/portal/domain/project/impl/ProjectMetadataImpl.java +++ b/src/main/java/org/wise/portal/domain/project/impl/ProjectMetadataImpl.java @@ -208,6 +208,10 @@ public class ProjectMetadataImpl implements ProjectMetadata, Serializable { @Setter private String resources; + @Getter + @Setter + private String unitType; + public ProjectMetadataImpl() { } @@ -377,6 +381,8 @@ public void populateFromJSON(JSONObject metadataJSON) { postLevel = (long) 5; } setPostLevel(postLevel); + + setUnitType(metadataJSON.optString("unitType", "Classroom")); } /** From 246dc80ebe10ac6248d827d90e850c23abd300dc Mon Sep 17 00:00:00 2001 From: Hiroki Terashima Date: Mon, 14 Apr 2025 11:12:03 -0700 Subject: [PATCH 3/3] Change default unitType to 'Platform' --- .../wise/portal/domain/project/impl/ProjectMetadataImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/wise/portal/domain/project/impl/ProjectMetadataImpl.java b/src/main/java/org/wise/portal/domain/project/impl/ProjectMetadataImpl.java index 52def3637..28445b1d3 100644 --- a/src/main/java/org/wise/portal/domain/project/impl/ProjectMetadataImpl.java +++ b/src/main/java/org/wise/portal/domain/project/impl/ProjectMetadataImpl.java @@ -382,7 +382,7 @@ public void populateFromJSON(JSONObject metadataJSON) { } setPostLevel(postLevel); - setUnitType(metadataJSON.optString("unitType", "Classroom")); + setUnitType(metadataJSON.optString("unitType", "Platform")); } /**