Tested jointeam and now working

wildmountainfarms · Aug 8, 2020 · 5f63005 · 5f63005
1 parent c63554c
commit 5f63005
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 11 deletions.
diff --git a/client/src/main/java/me/retrodaredevil/solarthing/program/pvoutput/PVOutputUploadMain.java b/client/src/main/java/me/retrodaredevil/solarthing/program/pvoutput/PVOutputUploadMain.java
@@ -35,6 +35,7 @@
 import me.retrodaredevil.solarthing.util.JacksonUtil;
 import net.bis5.mattermost.model.Team;
 import okhttp3.OkHttpClient;
+import okhttp3.ResponseBody;
 import okhttp3.logging.HttpLoggingInterceptor;
 import org.ektorp.CouchDbInstance;
 import org.ektorp.http.HttpClient;
@@ -236,7 +237,7 @@ private static int startRealTimeProgram(
 	) {
 		if (options.isJoinTeams()) {
 			LOGGER.info("Going to join SolarThing team...");
-			Call<String> call = service.joinTeam(new TeamParameters(PVOutputConstants.SOLARTHING_TEAM_ID));
+			Call<String> call = service.joinTeam(PVOutputConstants.SOLARTHING_TEAM_ID);
 			LOGGER.debug("Executing call");
 			Response<String> response = null;
 			try {
@@ -246,19 +247,30 @@ private static int startRealTimeProgram(
 			}
 			if (response != null) {
 				int code = response.code();
-				String message = response.message();
+				String errorBody;
+				try {
+					ResponseBody responseBody = response.errorBody();
+					if (responseBody != null) {
+						errorBody = responseBody.string();
+					} else {
+						errorBody = "null";
+					}
+				} catch (IOException e) {
+					e.printStackTrace();
+					errorBody = "exception occurred";
+				}
 				if (code == 200) {
-					LOGGER.info("Joined the SolarThing team! Response: " + message);
+					LOGGER.info("Joined the SolarThing team! Response: " + response.body());
 				} else if (code == 400) {
-					if (message.contains("already")) {
-						LOGGER.info("Already joined SolarThing team. Response: " + message);
-					} else if (message.contains("must have at least")) {
-						LOGGER.info("We will try joining SolarThing team later once we have more outputs. Response: " + message);
+					if (errorBody.contains("already")) {
+						LOGGER.info("Already joined SolarThing team. Response: " + errorBody);
+					} else if (errorBody.contains("must have at least")) {
+						LOGGER.info("We will try joining SolarThing team later once we have more outputs. Response: " + errorBody);
 					} else {
-						LOGGER.error("Error joining SolarThing team! Response: " + message);
+						LOGGER.error("Error joining SolarThing team! Response: " + errorBody);
 					}
 				} else {
-					LOGGER.error("Unknown error joining SolarThing team! Response: " + message);
+					LOGGER.error("Unknown error joining SolarThing team! Response: " + errorBody);
 				}
 			}
 		}

diff --git a/serviceapi/src/main/java/me/retrodaredevil/solarthing/pvoutput/data/TeamParameters.java b/serviceapi/src/main/java/me/retrodaredevil/solarthing/pvoutput/data/TeamParameters.java
@@ -2,6 +2,7 @@
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 
+@Deprecated
 public final class TeamParameters {
 	private final int teamId;
 

diff --git a/serviceapi/src/main/java/me/retrodaredevil/solarthing/pvoutput/service/PVOutputService.java b/serviceapi/src/main/java/me/retrodaredevil/solarthing/pvoutput/service/PVOutputService.java
@@ -3,11 +3,11 @@
 import me.retrodaredevil.solarthing.pvoutput.data.AddBatchOutputParameters;
 import me.retrodaredevil.solarthing.pvoutput.data.AddOutputParameters;
 import me.retrodaredevil.solarthing.pvoutput.data.AddStatusParameters;
-import me.retrodaredevil.solarthing.pvoutput.data.TeamParameters;
 import retrofit2.Call;
 import retrofit2.http.Body;
 import retrofit2.http.GET;
 import retrofit2.http.POST;
+import retrofit2.http.Query;
 
 public interface PVOutputService {
 	// Start Service API // https://pvoutput.org/help.html#api-spec
@@ -19,5 +19,5 @@ public interface PVOutputService {
 	Call<String> addBatchOutput(@Body AddBatchOutputParameters parameters);
 
 	@GET("jointeam.jsp")
-	Call<String> joinTeam(@Body TeamParameters teamParameters);
+	Call<String> joinTeam(@Query("tid") int teamId);
 }