From 287dcc8d97f4b82bc9f8c7aad3dc380342753587 Mon Sep 17 00:00:00 2001 From: Aaron Detre Date: Wed, 12 Feb 2025 13:33:44 -0800 Subject: [PATCH 1/2] refactor(CRaterRequest): Create AbstractCRaterRequest --- .../crater/AbstractCRaterRequest.java | 28 +++++++++++++++++++ .../crater/CRaterScoringRequest.java | 18 ++---------- .../crater/CRaterVerificationRequest.java | 28 +------------------ 3 files changed, 31 insertions(+), 43 deletions(-) create mode 100644 src/main/java/org/wise/vle/domain/webservice/crater/AbstractCRaterRequest.java diff --git a/src/main/java/org/wise/vle/domain/webservice/crater/AbstractCRaterRequest.java b/src/main/java/org/wise/vle/domain/webservice/crater/AbstractCRaterRequest.java new file mode 100644 index 000000000..bde1dbf2c --- /dev/null +++ b/src/main/java/org/wise/vle/domain/webservice/crater/AbstractCRaterRequest.java @@ -0,0 +1,28 @@ +package org.wise.vle.domain.webservice.crater; + +import org.json.JSONException; +import org.json.JSONObject; + +import lombok.Getter; +import lombok.Setter; + +@Setter +public abstract class AbstractCRaterRequest implements CRaterRequest { + String itemId; + String cRaterClientId; + + @Getter + String cRaterUrl; + + public String generateBodyData() throws JSONException { + JSONObject body = new JSONObject(); + body.put("client_id", cRaterClientId); + body.put("service", "ScoringService"); + body.put("item_id", itemId); + return body.toString(); + } + + public boolean forBerkeleyEndpoint() { + return itemId.substring(0, 9).equals("berkeley_"); + } +} diff --git a/src/main/java/org/wise/vle/domain/webservice/crater/CRaterScoringRequest.java b/src/main/java/org/wise/vle/domain/webservice/crater/CRaterScoringRequest.java index 6de02ef02..78bae6810 100644 --- a/src/main/java/org/wise/vle/domain/webservice/crater/CRaterScoringRequest.java +++ b/src/main/java/org/wise/vle/domain/webservice/crater/CRaterScoringRequest.java @@ -5,24 +5,15 @@ import org.json.JSONObject; import org.wise.portal.presentation.util.http.Base64; -import lombok.Getter; import lombok.Setter; @Setter -public class CRaterScoringRequest implements CRaterRequest { - String itemId; +public class CRaterScoringRequest extends AbstractCRaterRequest { String responseId; String responseText; - String cRaterClientId; - - @Getter - String cRaterUrl; public String generateBodyData() throws JSONException { - JSONObject body = new JSONObject(); - body.put("client_id", cRaterClientId); - body.put("service", "ScoringService"); - body.put("item_id", itemId); + JSONObject body = new JSONObject(super.generateBodyData()); JSONArray responses = new JSONArray(); JSONObject response = new JSONObject(); response.put("response_id", responseId); @@ -31,9 +22,4 @@ public String generateBodyData() throws JSONException { body.put("responses", responses); return body.toString(); } - - // Duplicate method implementation would be abstracted in issue 285 - public boolean forBerkeleyEndpoint() { - return itemId.substring(0, 9).equals("berkeley_"); - } } diff --git a/src/main/java/org/wise/vle/domain/webservice/crater/CRaterVerificationRequest.java b/src/main/java/org/wise/vle/domain/webservice/crater/CRaterVerificationRequest.java index f3dcaf14b..404c101de 100644 --- a/src/main/java/org/wise/vle/domain/webservice/crater/CRaterVerificationRequest.java +++ b/src/main/java/org/wise/vle/domain/webservice/crater/CRaterVerificationRequest.java @@ -1,29 +1,3 @@ package org.wise.vle.domain.webservice.crater; -import org.json.JSONException; -import org.json.JSONObject; - -import lombok.Getter; -import lombok.Setter; - -@Setter -public class CRaterVerificationRequest implements CRaterRequest { - String itemId; - String cRaterClientId; - - @Getter - String cRaterUrl; - - public String generateBodyData() throws JSONException { - JSONObject body = new JSONObject(); - body.put("client_id", cRaterClientId); - body.put("service", "VerificationService"); - body.put("item_id", itemId); - return body.toString(); - } - - // Duplicate method implementation would be abstracted in issue 285 - public boolean forBerkeleyEndpoint() { - return itemId.substring(0, 9).equals("berkeley_"); - } -} +public class CRaterVerificationRequest extends AbstractCRaterRequest {} From 2b1f147df571dff9053b88d4f737485b8115ebce Mon Sep 17 00:00:00 2001 From: Aaron Detre Date: Tue, 18 Feb 2025 12:19:38 -0800 Subject: [PATCH 2/2] Fixed verification request issue --- .../webservice/crater/AbstractCRaterRequest.java | 3 +-- .../webservice/crater/CRaterScoringRequest.java | 1 + .../webservice/crater/CRaterVerificationRequest.java | 11 ++++++++++- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/wise/vle/domain/webservice/crater/AbstractCRaterRequest.java b/src/main/java/org/wise/vle/domain/webservice/crater/AbstractCRaterRequest.java index bde1dbf2c..782d50c4a 100644 --- a/src/main/java/org/wise/vle/domain/webservice/crater/AbstractCRaterRequest.java +++ b/src/main/java/org/wise/vle/domain/webservice/crater/AbstractCRaterRequest.java @@ -17,12 +17,11 @@ public abstract class AbstractCRaterRequest implements CRaterRequest { public String generateBodyData() throws JSONException { JSONObject body = new JSONObject(); body.put("client_id", cRaterClientId); - body.put("service", "ScoringService"); body.put("item_id", itemId); return body.toString(); } public boolean forBerkeleyEndpoint() { - return itemId.substring(0, 9).equals("berkeley_"); + return itemId.length() > 9 && itemId.substring(0, 9).equals("berkeley_"); } } diff --git a/src/main/java/org/wise/vle/domain/webservice/crater/CRaterScoringRequest.java b/src/main/java/org/wise/vle/domain/webservice/crater/CRaterScoringRequest.java index 78bae6810..833ca9402 100644 --- a/src/main/java/org/wise/vle/domain/webservice/crater/CRaterScoringRequest.java +++ b/src/main/java/org/wise/vle/domain/webservice/crater/CRaterScoringRequest.java @@ -14,6 +14,7 @@ public class CRaterScoringRequest extends AbstractCRaterRequest { public String generateBodyData() throws JSONException { JSONObject body = new JSONObject(super.generateBodyData()); + body.put("service", "ScoringService"); JSONArray responses = new JSONArray(); JSONObject response = new JSONObject(); response.put("response_id", responseId); diff --git a/src/main/java/org/wise/vle/domain/webservice/crater/CRaterVerificationRequest.java b/src/main/java/org/wise/vle/domain/webservice/crater/CRaterVerificationRequest.java index 404c101de..05a3eec42 100644 --- a/src/main/java/org/wise/vle/domain/webservice/crater/CRaterVerificationRequest.java +++ b/src/main/java/org/wise/vle/domain/webservice/crater/CRaterVerificationRequest.java @@ -1,3 +1,12 @@ package org.wise.vle.domain.webservice.crater; -public class CRaterVerificationRequest extends AbstractCRaterRequest {} +import org.json.JSONException; +import org.json.JSONObject; + +public class CRaterVerificationRequest extends AbstractCRaterRequest { + public String generateBodyData() throws JSONException { + JSONObject body = new JSONObject(super.generateBodyData()); + body.put("service", "VerificationService"); + return body.toString(); + } +}