From a63dd871bdeebe6fdbbf9ca86679da4a6c871900 Mon Sep 17 00:00:00 2001
From: LO Kam Tao Leo <leolo@leolo.org>
Date: Fri, 28 Oct 2022 20:14:45 +0100
Subject: [PATCH] Code refactoring

---
 .../org/leolo/nrdatad/cron/ReferenceDataJob.java     | 10 +---------
 src/main/java/org/leolo/nrdatad/model/Corpus.java    | 18 ++++++++++++++++++
 .../org/leolo/nrdatad/ReferenceDataParserTest.java   | 20 ++++++++++++++++++++
 3 files changed, 39 insertions(+), 9 deletions(-)
 create mode 100644 src/test/java/org/leolo/nrdatad/ReferenceDataParserTest.java

diff --git a/src/main/java/org/leolo/nrdatad/cron/ReferenceDataJob.java b/src/main/java/org/leolo/nrdatad/cron/ReferenceDataJob.java
index 35ee0c6..861d43e 100644
--- a/src/main/java/org/leolo/nrdatad/cron/ReferenceDataJob.java
+++ b/src/main/java/org/leolo/nrdatad/cron/ReferenceDataJob.java
@@ -69,15 +69,7 @@ public class ReferenceDataJob implements Job {
         ArrayList<Corpus> corpusList = new ArrayList<>();
         for(int i=0;i<rootArray.length();i++){
             JSONObject obj = rootArray.getJSONObject(i);
-            Corpus corpus = new Corpus();
-            corpus.setStanoxCode(obj.optString("STANOX"));
-            corpus.setUicCode(obj.optString("UIC"));
-            corpus.setCrsCode(obj.optString("3ALPHA"));
-            corpus.setTiplocCode(obj.optString("TIPLOC"));
-            corpus.setNlcCode(obj.optString("NLC"));
-            corpus.setLongDescription(obj.optString("NLCDESC"));
-            corpus.setShortDescription(obj.optString("NLCDESC16"));
-            corpusList.add(corpus);
+            corpusList.add(Corpus.parseJSON(obj));
         }
         log.atInfo().log("Going to replace the data");
         try {
diff --git a/src/main/java/org/leolo/nrdatad/model/Corpus.java b/src/main/java/org/leolo/nrdatad/model/Corpus.java
index e18979a..cdc3ab0 100644
--- a/src/main/java/org/leolo/nrdatad/model/Corpus.java
+++ b/src/main/java/org/leolo/nrdatad/model/Corpus.java
@@ -1,5 +1,7 @@
 package org.leolo.nrdatad.model;
 
+import org.json.JSONObject;
+
 import java.util.Objects;
 
 public class Corpus {
@@ -94,4 +96,20 @@ public class Corpus {
                 ", shortDescription='" + shortDescription + '\'' +
                 '}';
     }
+
+    public static Corpus parseJSON(JSONObject obj){
+        Corpus corpus = new Corpus();
+        corpus.setStanoxCode(obj.optString("STANOX"));
+        corpus.setUicCode(obj.optString("UIC"));
+        corpus.setCrsCode(obj.optString("3ALPHA"));
+        corpus.setTiplocCode(obj.optString("TIPLOC"));
+        corpus.setNlcCode(obj.optString("NLC"));
+        corpus.setLongDescription(obj.optString("NLCDESC"));
+        corpus.setShortDescription(obj.optString("NLCDESC16"));
+        return corpus;
+    }
+
+    public static Corpus parseJSON(String json){
+        return parseJSON(new JSONObject(json));
+    }
 }
diff --git a/src/test/java/org/leolo/nrdatad/ReferenceDataParserTest.java b/src/test/java/org/leolo/nrdatad/ReferenceDataParserTest.java
new file mode 100644
index 0000000..8f16c68
--- /dev/null
+++ b/src/test/java/org/leolo/nrdatad/ReferenceDataParserTest.java
@@ -0,0 +1,20 @@
+package org.leolo.nrdatad;
+import org.junit.Test;
+import org.leolo.nrdatad.model.Corpus;
+
+import static org.junit.Assert.*;
+public class ReferenceDataParserTest {
+
+    @Test
+    public void testNormalCase1(){
+        String json = "{\"NLC\":\"535500\",\"STANOX\":\"87701\",\"TIPLOC\":\"ECROYDN\",\"3ALPHA\":\"ECR\",\"UIC\":\"53550\",\"NLCDESC\":\"EAST CROYDON\",\"NLCDESC16\":\"\"}";
+        Corpus corpus = Corpus.parseJSON(json);
+        assertEquals("535500", corpus.getNlcCode());
+        assertEquals("87701", corpus.getStanoxCode());
+        assertEquals("ECROYDN", corpus.getTiplocCode());
+        assertEquals("ECR", corpus.getCrsCode());
+        assertEquals("53550", corpus.getUicCode());
+        assertEquals("EAST CROYDON", corpus.getLongDescription());
+    }
+}
+