Ticket/042 phone number input

.gitignore

@@ -1,4 +1,5 @@
 # Google App Engine generated folder
 appengine-generated/
 *.class
-.DS_Store
+.DS_Store
+keystore.properties

IntelliQ/backend/src/main/java/com/intelliq/appengine/ImageServlet.java

@@ -4,7 +4,6 @@
 import com.google.common.io.ByteStreams;
 import com.intelliq.appengine.api.ApiRequest;
 import com.intelliq.appengine.api.ApiResponse;
-import com.intelliq.appengine.api.PermissionSet;
 import com.intelliq.appengine.datastore.BusinessHelper;
 import com.intelliq.appengine.datastore.ImageHelper;
 import com.intelliq.appengine.datastore.QueueHelper;

IntelliQ/backend/src/main/java/com/intelliq/appengine/ParserHelper.java

@@ -6,10 +6,6 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import com.google.appengine.api.urlfetch.HTTPResponse;
-import com.google.appengine.api.urlfetch.URLFetchService;
-import com.google.appengine.api.urlfetch.URLFetchServiceFactory;
-
 public class ParserHelper {
 
     public static final int MODE_FIRST_FIRST = 0;

IntelliQ/backend/src/main/java/com/intelliq/appengine/RequestFilter.java

@@ -40,7 +40,7 @@ public void doFilter(ServletRequest request, ServletResponse response, FilterCha
         if (path.startsWith("/static") || path.startsWith("/_ah") || path.startsWith("/intelliq")) {
             // preserve special routes
             filterChain.doFilter(request, response);
-        } else if(uri.contains(".well-known/assetlinks.json")) {
+        } else if (uri.contains(".well-known/assetlinks.json")) {
             // redirect to Digital Asset Links JSON file
             RequestDispatcher rd = request.getRequestDispatcher("/static/assetlinks.json");
             rd.forward(request, response);

IntelliQ/backend/src/main/java/com/intelliq/appengine/api/ApiRequest.java

@@ -1,15 +1,14 @@
 package com.intelliq.appengine.api;
 
-import java.util.logging.Logger;
-
-import javax.servlet.http.HttpServletRequest;
-
 import com.google.api.client.googleapis.auth.oauth2.GoogleIdToken.Payload;
 import com.intelliq.appengine.ParserHelper;
-import com.intelliq.appengine.api.endpoint.EndpointManager;
 import com.intelliq.appengine.datastore.UserHelper;
 import com.intelliq.appengine.datastore.entries.UserEntry;
 
+import java.util.logging.Logger;
+
+import javax.servlet.http.HttpServletRequest;
+
 public class ApiRequest {
 
     private static final Logger log = Logger.getLogger(ApiRequest.class.getName());

IntelliQ/backend/src/main/java/com/intelliq/appengine/api/ApiResponse.java

@@ -1,9 +1,9 @@
 package com.intelliq.appengine.api;
 
-import javax.servlet.http.HttpServletResponse;
-
 import com.google.gson.Gson;
 
+import javax.servlet.http.HttpServletResponse;
+
 public class ApiResponse {
 
     int statusCode = HttpServletResponse.SC_OK;

IntelliQ/backend/src/main/java/com/intelliq/appengine/api/PermissionSet.java

@@ -1,10 +1,10 @@
 package com.intelliq.appengine.api;
 
+import com.intelliq.appengine.datastore.entries.PermissionEntry;
+
 import java.util.ArrayList;
 import java.util.List;
 
-import com.intelliq.appengine.datastore.entries.PermissionEntry;
-
 public class PermissionSet {
 
     public static final byte REQUIRE_ANY = 0;

IntelliQ/backend/src/main/java/com/intelliq/appengine/api/endpoint/Endpoint.java

@@ -1,19 +1,17 @@
 package com.intelliq.appengine.api.endpoint;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.logging.Logger;
-
-import javax.servlet.http.HttpServletResponse;
-
 import com.intelliq.appengine.ParserHelper;
 import com.intelliq.appengine.api.ApiRequest;
 import com.intelliq.appengine.api.ApiResponse;
-import com.intelliq.appengine.api.ApiServlet;
 import com.intelliq.appengine.api.PermissionSet;
-import com.intelliq.appengine.datastore.entries.PermissionEntry;
 import com.intelliq.appengine.datastore.entries.UserEntry;
 
+import java.util.ArrayList;
+import java.util.List;
+import java.util.logging.Logger;
+
+import javax.servlet.http.HttpServletResponse;
+
 /**
  * Abstract endpoint that every API endpoint needs to extend.
  * Contains all basic methods and some that may need to be overwritten.

IntelliQ/backend/src/main/java/com/intelliq/appengine/api/endpoint/EndpointManager.java

@@ -1,14 +1,14 @@
 package com.intelliq.appengine.api.endpoint;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import com.intelliq.appengine.api.ApiRequest;
 import com.intelliq.appengine.api.endpoint.business.BusinessEndpoint;
 import com.intelliq.appengine.api.endpoint.queue.QueueEndpoint;
 import com.intelliq.appengine.api.endpoint.queueitem.QueueItemEndpoint;
 import com.intelliq.appengine.api.endpoint.user.UserEndpoint;
 
+import java.util.ArrayList;
+import java.util.List;
+
 public final class EndpointManager {
 
     public static final int API_VERSION = 1;

IntelliQ/backend/src/main/java/com/intelliq/appengine/api/endpoint/business/AddBusinessEndpoint.java

@@ -1,30 +1,26 @@
 package com.intelliq.appengine.api.endpoint.business;
 
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.servlet.http.HttpServletResponse;
-
-import java.util.logging.Logger;
-
 import com.google.appengine.api.datastore.Key;
-import com.intelliq.appengine.ParserHelper;
 import com.intelliq.appengine.api.ApiRequest;
 import com.intelliq.appengine.api.ApiResponse;
 import com.intelliq.appengine.api.endpoint.Endpoint;
 import com.intelliq.appengine.api.endpoint.EndpointManager;
 import com.intelliq.appengine.datastore.BusinessHelper;
 import com.intelliq.appengine.datastore.PermissionHelper;
 import com.intelliq.appengine.datastore.QueueHelper;
-import com.intelliq.appengine.datastore.QueueItemHelper;
 import com.intelliq.appengine.datastore.UserHelper;
 import com.intelliq.appengine.datastore.entries.BusinessEntry;
 import com.intelliq.appengine.datastore.entries.PermissionEntry;
 import com.intelliq.appengine.datastore.entries.QueueEntry;
-import com.intelliq.appengine.datastore.entries.QueueItemEntry;
 import com.intelliq.appengine.datastore.entries.UserEntry;
 import com.intelliq.appengine.logging.BusinessLogging;
 
+import java.util.ArrayList;
+import java.util.List;
+import java.util.logging.Logger;
+
+import javax.servlet.http.HttpServletResponse;
+
 
 public class AddBusinessEndpoint extends Endpoint {
 

IntelliQ/backend/src/main/java/com/intelliq/appengine/api/endpoint/business/BusinessEndpoint.java

@@ -1,13 +1,13 @@
 package com.intelliq.appengine.api.endpoint.business;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import com.intelliq.appengine.api.ApiRequest;
 import com.intelliq.appengine.api.ApiResponse;
 import com.intelliq.appengine.api.endpoint.Endpoint;
 import com.intelliq.appengine.api.endpoint.EndpointManager;
 
+import java.util.ArrayList;
+import java.util.List;
+
 public class BusinessEndpoint extends Endpoint {
 
     public static final List<Endpoint> endpoints = getAvailableEndpoints();

IntelliQ/backend/src/main/java/com/intelliq/appengine/api/endpoint/business/EditBusinessEndpoint.java

@@ -1,31 +1,22 @@
 package com.intelliq.appengine.api.endpoint.business;
 
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
-import javax.jdo.JDOObjectNotFoundException;
-import javax.servlet.http.HttpServletResponse;
-
-import com.google.appengine.api.datastore.Key;
-import com.intelliq.appengine.ParserHelper;
 import com.intelliq.appengine.api.ApiRequest;
 import com.intelliq.appengine.api.ApiResponse;
 import com.intelliq.appengine.api.PermissionSet;
 import com.intelliq.appengine.api.endpoint.Endpoint;
 import com.intelliq.appengine.api.endpoint.EndpointManager;
 import com.intelliq.appengine.datastore.BusinessHelper;
-import com.intelliq.appengine.datastore.PermissionHelper;
-import com.intelliq.appengine.datastore.QueueHelper;
-import com.intelliq.appengine.datastore.QueueItemHelper;
-import com.intelliq.appengine.datastore.UserHelper;
 import com.intelliq.appengine.datastore.entries.BusinessEntry;
 import com.intelliq.appengine.datastore.entries.PermissionEntry;
-import com.intelliq.appengine.datastore.entries.QueueEntry;
-import com.intelliq.appengine.datastore.entries.QueueItemEntry;
 import com.intelliq.appengine.datastore.entries.UserEntry;
 import com.intelliq.appengine.logging.BusinessLogging;
 
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.jdo.JDOObjectNotFoundException;
+import javax.servlet.http.HttpServletResponse;
+
 
 public class EditBusinessEndpoint extends Endpoint {
 

IntelliQ/backend/src/main/java/com/intelliq/appengine/api/endpoint/business/FromBusinessEndpoint.java

@@ -1,25 +1,19 @@
 package com.intelliq.appengine.api.endpoint.business;
 
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.servlet.http.HttpServletResponse;
-
-import org.datanucleus.exceptions.NucleusObjectNotFoundException;
-
 import com.intelliq.appengine.api.ApiRequest;
 import com.intelliq.appengine.api.ApiResponse;
 import com.intelliq.appengine.api.endpoint.Endpoint;
 import com.intelliq.appengine.api.endpoint.EndpointManager;
 import com.intelliq.appengine.datastore.BusinessHelper;
-import com.intelliq.appengine.datastore.QueueHelper;
-import com.intelliq.appengine.datastore.QueueItemHelper;
-import com.intelliq.appengine.datastore.UserHelper;
 import com.intelliq.appengine.datastore.entries.BusinessEntry;
 import com.intelliq.appengine.datastore.entries.PermissionEntry;
-import com.intelliq.appengine.datastore.entries.QueueEntry;
-import com.intelliq.appengine.datastore.entries.QueueItemEntry;
-import com.intelliq.appengine.datastore.entries.UserEntry;
+
+import org.datanucleus.exceptions.NucleusObjectNotFoundException;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.servlet.http.HttpServletResponse;
 
 
 public class FromBusinessEndpoint extends Endpoint {

IntelliQ/backend/src/main/java/com/intelliq/appengine/api/endpoint/business/GetBusinessEndpoint.java

@@ -1,24 +1,21 @@
 package com.intelliq.appengine.api.endpoint.business;
 
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.servlet.http.HttpServletResponse;
-
-import org.datanucleus.exceptions.NucleusObjectNotFoundException;
-
 import com.intelliq.appengine.api.ApiRequest;
 import com.intelliq.appengine.api.ApiResponse;
 import com.intelliq.appengine.api.endpoint.Endpoint;
 import com.intelliq.appengine.api.endpoint.EndpointManager;
 import com.intelliq.appengine.datastore.BusinessHelper;
 import com.intelliq.appengine.datastore.QueueHelper;
-import com.intelliq.appengine.datastore.QueueItemHelper;
-import com.intelliq.appengine.datastore.UserHelper;
 import com.intelliq.appengine.datastore.entries.BusinessEntry;
 import com.intelliq.appengine.datastore.entries.QueueEntry;
 import com.intelliq.appengine.datastore.entries.QueueItemEntry;
-import com.intelliq.appengine.datastore.entries.UserEntry;
+
+import org.datanucleus.exceptions.NucleusObjectNotFoundException;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.servlet.http.HttpServletResponse;
 
 
 public class GetBusinessEndpoint extends Endpoint {

IntelliQ/backend/src/main/java/com/intelliq/appengine/api/endpoint/queue/AddQueueEndpoint.java

@@ -1,11 +1,5 @@
 package com.intelliq.appengine.api.endpoint.queue;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.logging.Logger;
-
-import javax.servlet.http.HttpServletResponse;
-
 import com.google.appengine.api.datastore.Key;
 import com.intelliq.appengine.api.ApiRequest;
 import com.intelliq.appengine.api.ApiResponse;
@@ -20,6 +14,12 @@
 import com.intelliq.appengine.datastore.entries.UserEntry;
 import com.intelliq.appengine.logging.QueueLogging;
 
+import java.util.ArrayList;
+import java.util.List;
+import java.util.logging.Logger;
+
+import javax.servlet.http.HttpServletResponse;
+
 
 public class AddQueueEndpoint extends Endpoint {
 

IntelliQ/backend/src/main/java/com/intelliq/appengine/api/endpoint/queue/ClearQueueItemsEndpoint.java

@@ -1,19 +1,17 @@
 package com.intelliq.appengine.api.endpoint.queue;
 
-import java.util.ArrayList;
-import java.util.List;
-
-import com.intelliq.appengine.ParserHelper;
 import com.intelliq.appengine.api.ApiRequest;
 import com.intelliq.appengine.api.ApiResponse;
 import com.intelliq.appengine.api.PermissionSet;
 import com.intelliq.appengine.api.endpoint.Endpoint;
 import com.intelliq.appengine.api.endpoint.EndpointManager;
 import com.intelliq.appengine.datastore.QueueHelper;
 import com.intelliq.appengine.datastore.entries.PermissionEntry;
-import com.intelliq.appengine.datastore.entries.QueueEntry;
 import com.intelliq.appengine.datastore.entries.QueueItemEntry;
 
+import java.util.ArrayList;
+import java.util.List;
+
 
 public class ClearQueueItemsEndpoint extends Endpoint {
 
@@ -73,7 +71,7 @@ public ApiResponse generateRequestResponse(ApiRequest request) throws Exception
             QueueHelper.deleteItemsInQueue(queueKeyId, status);
         }
 
-        List<QueueItemEntry> entries = QueueHelper.getItemsInQueue(queueKeyId, 0, 100);
+        List<QueueItemEntry> entries = QueueHelper.getItemsInQueue(queueKeyId, QueueItemEntry.STATUS_ALL, 0, 100);
         response.setContent(entries);
         return response;
     }

IntelliQ/backend/src/main/java/com/intelliq/appengine/api/endpoint/queue/EditQueueEndpoint.java

@@ -1,27 +1,22 @@
 package com.intelliq.appengine.api.endpoint.queue;
 
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.jdo.JDOObjectNotFoundException;
-import javax.servlet.http.HttpServletResponse;
-
-import com.google.appengine.api.datastore.Key;
 import com.intelliq.appengine.api.ApiRequest;
 import com.intelliq.appengine.api.ApiResponse;
 import com.intelliq.appengine.api.PermissionSet;
 import com.intelliq.appengine.api.endpoint.Endpoint;
 import com.intelliq.appengine.api.endpoint.EndpointManager;
-import com.intelliq.appengine.datastore.BusinessHelper;
-import com.intelliq.appengine.datastore.PermissionHelper;
 import com.intelliq.appengine.datastore.QueueHelper;
-import com.intelliq.appengine.datastore.UserHelper;
-import com.intelliq.appengine.datastore.entries.BusinessEntry;
 import com.intelliq.appengine.datastore.entries.PermissionEntry;
 import com.intelliq.appengine.datastore.entries.QueueEntry;
 import com.intelliq.appengine.datastore.entries.UserEntry;
 import com.intelliq.appengine.logging.QueueLogging;
 
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.jdo.JDOObjectNotFoundException;
+import javax.servlet.http.HttpServletResponse;
+
 
 public class EditQueueEndpoint extends Endpoint {