Skip to content

Unit library redesign 2025 #302

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
merged 4 commits into from
Apr 21, 2025
Merged

Unit library redesign 2025 #302

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3c866a9
feat(ProjectMetadata): Save and retrieve resources (#295)
hirokiterashima Apr 14, 2025
0b3afb5
feat(Metadata): Add standard and discipline fields (#299)
hirokiterashima Apr 14, 2025
e632ad2
Add features in metadata response (#300)
hirokiterashima Apr 18, 2025
6c0b86b
Remove researchProjects field
hirokiterashima Apr 21, 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
79 changes: 59 additions & 20 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 @@ -132,7 +132,6 @@ public class ProjectMetadataImpl implements ProjectMetadata, Serializable {
@Setter
private String lessonPlan;

@Column(name = "standards", length = 5120000, columnDefinition = "mediumtext")
@Getter
@Setter
private String standards;
Expand Down Expand Up @@ -202,7 +201,17 @@ public class ProjectMetadataImpl implements ProjectMetadata, Serializable {

@Getter
@Setter
private String researchProjects;
private String disciplines;

@Getter
@Setter
private String resources;

private String standardsDefault = "{\"commonCore\": [], \"ngss\": [], \"learningForJustice\": []}";

@Getter
@Setter
private String unitType;

public ProjectMetadataImpl() {
}
Expand Down Expand Up @@ -240,11 +249,17 @@ public void populateFromJSON(JSONObject metadataJSON) {
}
setAuthors(authors.toString());

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

JSONArray resources = metadataJSON.optJSONArray("resources");
if (resources == null) {
resources = new JSONArray();
}
setResearchProjects(researchProjects.toString());
setResources(resources.toString());

JSONArray parentProjects = metadataJSON.optJSONArray("parentProjects");
if (parentProjects == null) {
Expand Down Expand Up @@ -318,10 +333,7 @@ public void populateFromJSON(JSONObject metadataJSON) {
}
setLessonPlan(lessonPlan);

String standards = metadataJSON.optString("standards", "");
if (standards.equals("null")) {
standards = "";
}
String standards = metadataJSON.optString("standards", this.standardsDefault);
setStandards(standards);

JSONObject standardsAddressed = metadataJSON.optJSONObject("standardsAddressed");
Expand Down Expand Up @@ -367,6 +379,8 @@ public void populateFromJSON(JSONObject metadataJSON) {
postLevel = (long) 5;
}
setPostLevel(postLevel);

setUnitType(metadataJSON.optString("unitType", "Platform"));
}

/**
Expand Down Expand Up @@ -455,12 +469,17 @@ public String toJSONString() {
metadata.put("tools", new JSONObject());
}

String standardsAddressedString = metadata.getString("standardsAddressed");
if (standardsAddressedString != null && standardsAddressedString != "null") {
JSONObject standardsAddressedJSON = new JSONObject(standardsAddressedString);
metadata.put("standardsAddressed", standardsAddressedJSON);
String standardsString = metadata.getString("standards");
if (standardsString != null && standardsString != "null") {
JSONObject standardsJSON;
try {
standardsJSON = new JSONObject(standardsString);
} catch (JSONException e) {
standardsJSON = new JSONObject(standardsDefault);
}
metadata.put("standards", standardsJSON);
} else {
metadata.put("standardsAddressed", new JSONObject());
metadata.put("standards", new JSONObject());
}

String parentProjectsString = metadata.getString("parentProjects");
Expand All @@ -471,14 +490,34 @@ public String toJSONString() {
metadata.put("parentProjects", new JSONArray());
}

String researchProjectsString = metadata.getString("researchProjects");
if (researchProjectsString != null && researchProjectsString != "null") {
JSONArray researchProjectsJSON = new JSONArray(researchProjectsString);
metadata.put("researchProjects", researchProjectsJSON);
String disciplinesString = metadata.getString("disciplines");
if (disciplinesString != null && disciplinesString != "null") {
JSONArray disciplinesJSON = new JSONArray(disciplinesString);
metadata.put("disciplines", disciplinesJSON);
} else {
metadata.put("researchProjects", new JSONArray());
metadata.put("disciplines", new JSONArray());
}

String featuresString = metadata.getString("features");
if (featuresString != null && featuresString != "null") {
JSONArray featuresJSON;
try {
featuresJSON = new JSONArray(featuresString);
} catch (JSONException e) {
featuresJSON = new JSONArray();
}
metadata.put("features", featuresJSON);
} else {
metadata.put("features", 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();
}
Expand Down