Revert "feat(Metadata): Add standard and discipline fields (#298)"

This reverts commit fbcadb3.

Author: hirokiterashima

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

@@ -132,6 +132,7 @@ public class ProjectMetadataImpl implements ProjectMetadata, Serializable {
   @Setter
   private String lessonPlan;
 
+  @Column(name = "standards", length = 5120000, columnDefinition = "mediumtext")
   @Getter
   @Setter
   private String standards;
@@ -203,20 +204,6 @@ public class ProjectMetadataImpl implements ProjectMetadata, Serializable {
   @Setter
   private String researchProjects;
 
-  @Getter
-  @Setter
-  private String disciplines;
-
-  @Getter
-  @Setter
-  private String resources;
-
-  private String standardsDefault = "{\"commonCore\": [], \"ngss\": [], \"learningForJustice\": []}";
-
-  @Getter
-  @Setter
-  private String unitType;
-
   public ProjectMetadataImpl() {
   }
 
@@ -259,18 +246,6 @@ public void populateFromJSON(JSONObject metadataJSON) {
     }
     setResearchProjects(researchProjects.toString());
 
-    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();
-    }
-    setResources(resources.toString());
-
     JSONArray parentProjects = metadataJSON.optJSONArray("parentProjects");
     if (parentProjects == null) {
       parentProjects = new JSONArray();
@@ -343,7 +318,10 @@ public void populateFromJSON(JSONObject metadataJSON) {
     }
     setLessonPlan(lessonPlan);
 
-    String standards = metadataJSON.optString("standards", this.standardsDefault);
+    String standards = metadataJSON.optString("standards", "");
+    if (standards.equals("null")) {
+      standards = "";
+    }
     setStandards(standards);
 
     JSONObject standardsAddressed = metadataJSON.optJSONObject("standardsAddressed");
@@ -389,8 +367,6 @@ public void populateFromJSON(JSONObject metadataJSON) {
       postLevel = (long) 5;
     }
     setPostLevel(postLevel);
-
-    setUnitType(metadataJSON.optString("unitType", "Platform"));
   }
 
   /**
@@ -479,17 +455,12 @@ public String toJSONString() {
         metadata.put("tools", new JSONObject());
       }
 
-      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);
+      String standardsAddressedString = metadata.getString("standardsAddressed");
+      if (standardsAddressedString != null && standardsAddressedString != "null") {
+        JSONObject standardsAddressedJSON = new JSONObject(standardsAddressedString);
+        metadata.put("standardsAddressed", standardsAddressedJSON);
       } else {
-        metadata.put("standards", new JSONObject());
+        metadata.put("standardsAddressed", new JSONObject());
       }
 
       String parentProjectsString = metadata.getString("parentProjects");
@@ -508,21 +479,6 @@ 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());
-      }
-
-      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();
     }