No Active Dashboard Exception

HenrikDA · Mar 24, 2015 · e8212bd · e8212bd
1 parent a765b98
commit e8212bd
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 3 deletions.
diff --git a/README_FOR_APP_DEVS.md b/README_FOR_APP_DEVS.md
@@ -97,6 +97,7 @@ Response message structure:
     5 - user hasn’t made login command
     6 - user is not allowed to perform this operation (most probably is not logged or socket has been closed)
     7 - hardware is offline
+    8 - no active dashboard. User has to activated dashboard.
     9 - token is invalid
     11 - user is already logged in. Happens in cases when same user tries to login for more than one time.
     12 - tweet exception, exception occurred during posting request to Twitter could be in case messages are the same in a row;

diff --git a/common/src/main/java/cc/blynk/common/enums/Response.java b/common/src/main/java/cc/blynk/common/enums/Response.java
@@ -19,6 +19,7 @@ public final class Response {
     public static final int USER_NOT_AUTHENTICATED = 5;
     public static final int NOT_ALLOWED = 6;
     public static final int DEVICE_NOT_IN_NETWORK = 7;
+    public static final int NO_ACTIVE_DASHBOARD = 8;
     public static final int INVALID_TOKEN = 9;
     public static final int USER_ALREADY_LOGGED_IN = 11;
     public static final int TWEET_EXCEPTION = 12;

diff --git a/integration-tests/src/test/java/cc/blynk/integration/MainWorkflowTest.java b/integration-tests/src/test/java/cc/blynk/integration/MainWorkflowTest.java
@@ -140,7 +140,7 @@ public void testActivateWorkflow() throws Exception {
         verify(clientPair.appClient.responseMock, timeout(500)).channelRead(any(), eq(produce(2, OK)));
 
         clientPair.appClient.send("hardware ar 1 1");
-        verify(clientPair.appClient.responseMock, timeout(500)).channelRead(any(), eq(produce(3, ILLEGAL_COMMAND)));
+        verify(clientPair.appClient.responseMock, timeout(500)).channelRead(any(), eq(produce(3, NO_ACTIVE_DASHBOARD)));
 
         clientPair.appClient.send("activate 1");
         verify(clientPair.appClient.responseMock, timeout(500)).channelRead(any(), eq(produce(4, OK)));

diff --git a/server/tcp-server/src/main/java/cc/blynk/server/exceptions/NoActiveDashboardException.java b/server/tcp-server/src/main/java/cc/blynk/server/exceptions/NoActiveDashboardException.java
@@ -0,0 +1,17 @@
+package cc.blynk.server.exceptions;
+
+import cc.blynk.common.enums.Response;
+import cc.blynk.common.exceptions.BaseServerException;
+
+/**
+ * The Blynk Project.
+ * Created by Dmitriy Dumanskiy.
+ * Created on 2/23/2015.
+ */
+public class NoActiveDashboardException extends BaseServerException {
+
+    public NoActiveDashboardException(String message, int msgId) {
+        super(message, msgId, Response.NO_ACTIVE_DASHBOARD);
+    }
+
+}
diff --git a/server/tcp-server/src/main/java/cc/blynk/server/handlers/workflow/HardwareHandler.java b/server/tcp-server/src/main/java/cc/blynk/server/handlers/workflow/HardwareHandler.java
@@ -4,7 +4,7 @@
 import cc.blynk.common.utils.ServerProperties;
 import cc.blynk.server.dao.*;
 import cc.blynk.server.exceptions.DeviceNotInNetworkException;
-import cc.blynk.server.exceptions.IllegalCommandException;
+import cc.blynk.server.exceptions.NoActiveDashboardException;
 import cc.blynk.server.model.auth.Session;
 import cc.blynk.server.model.auth.User;
 import cc.blynk.server.model.auth.nio.ChannelState;
@@ -45,7 +45,7 @@ protected void messageReceived(ChannelHandlerContext ctx, User user, HardwareMes
             Session.sendMessageTo(message.updateMessageBody(body), session.appChannels);
         } else {
             if (user.getUserProfile().getActiveDashId() == null) {
-                throw new IllegalCommandException("No active dashboard.", message.id);
+                throw new NoActiveDashboardException("No active dashboard.", message.id);
             }
 
             if (session.hardwareChannels.size() == 0) {