Dev

IntelliQ/.gitignore

@@ -1,8 +1,8 @@
 *.iml
+**/*.iml
 .gradle
 /local.properties
-/.idea/workspace.xml
-/.idea/libraries
+/.idea/
 .DS_Store
 /build
 /*/build

IntelliQ/backend/build.gradle

@@ -24,7 +24,7 @@ sourceCompatibility = JavaVersion.VERSION_1_7
 targetCompatibility = JavaVersion.VERSION_1_7
 
 dependencies {
-    //compile fileTree(dir: 'libs', include: ['*.jar'])
+    compile fileTree(dir: 'libs', include: ['*.jar'])
     appengineSdk 'com.google.appengine:appengine-java-sdk:1.9.38'
     compile group: 'com.google.apis', name: 'google-api-services-oauth2', version: 'v1-rev120-1.22.0'
 
@@ -42,8 +42,12 @@ dependencies {
     compile group: 'commons-fileupload', name: 'commons-fileupload', version: '1.3.2'
 
     compile 'javax.servlet:servlet-api:2.5'
-}
 
+    testCompile 'com.google.appengine:appengine-api-labs:1.9.8'
+    testCompile 'com.google.appengine:appengine-api-stubs:1.9.8'
+    testCompile 'com.google.appengine:appengine-testing:1.9.8'
+    testCompile 'junit:junit:4.12'
+}
 
 appengine {
     downloadSdk = true
@@ -56,3 +60,31 @@ appengine {
         enhanceOnBuild = true
     }
 }
+
+task backupDataStore << {
+    copy {
+        from 'build/exploded-app/WEB-INF/appengine-generated'
+        into 'datastore/'
+        include '**/*.xml'
+        include '**/*.bin'
+    }
+    println "Backed up datastore"
+}
+
+task restoreDataStore << {
+    copy {
+        from 'datastore/'
+        into 'build/exploded-app/WEB-INF/appengine-generated'
+        include '**/*.xml'
+        include '**/*.bin'
+    }
+    println "Restored datastore"
+}
+
+appengineExplodeApp.doFirst {
+    backupDataStore.execute()
+}
+
+appengineExplodeApp.doLast {
+    restoreDataStore.execute()
+}

IntelliQ/backend/datastore/datastore-indexes-auto.xml

@@ -0,0 +1,4 @@
+<!-- Indices written at Thu, 29 Sep 2016 11:16:09 CEST -->
+
+<datastore-indexes/>
+

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

@@ -28,128 +28,128 @@
 @SuppressWarnings("serial")
 public class ImageServlet extends HttpServlet {
 
-	private static final Logger log = Logger.getLogger(ImageServlet.class.getName());
-
-	@Override
-	public void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOException, ServletException {
-
-		String requestUrl = req.getRequestURL().toString();
-
-		try {
-			// image request pattern: .../image/[imageKeyId]/[size].jpg
-
-			String imageSizeString = ParserHelper.getStringAfter("/", req.getPathInfo(), ParserHelper.MODE_LAST_LAST);
-			if (imageSizeString.contains(".png")) {
-				imageSizeString = ParserHelper.getStringBefore(".png", imageSizeString);
-			} else if (imageSizeString.contains(".jpg")) {
-				imageSizeString = ParserHelper.getStringBefore(".jpg", imageSizeString);
-			} else {
-				throw new Exception("Unknown file type requested");
-			}
-
-			String imageKeyIdParam = ParserHelper.getStringBefore("/" + imageSizeString, req.getPathInfo(), ParserHelper.MODE_LAST_LAST);
-			imageKeyIdParam = ParserHelper.getStringAfter("/", imageKeyIdParam, ParserHelper.MODE_LAST_LAST);
-			long imageKeyId = Long.parseLong(imageKeyIdParam);
-			
-			if (imageKeyId < 0) {
-				throw new Exception("Image key ID is invalid");
-			}
-			
-			ImageQuery imageQuery = new ImageQuery();
-			ImageEntry image = imageQuery.getImageByKeyId(imageKeyId);
-			
-			if (image.getImageType() == null || image.getImage() == null) {
-				// image = EntryManager.fetchImageFromUrl(image.getUrl());
-				throw new Exception("Image data unavailable");
-			}
-			
-			resp.setContentType(image.getImageType());
-			resp.getOutputStream().write(ImageHelper.resizeImage(image.getImage(), imageSizeString));
-		} catch (Exception e) {
-			resp.sendRedirect("/static/images/not_found.jpg");
-		}
-	}
-
-	@Override
-	public void doPost(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException {
-		ApiResponse responseObject = new ApiResponse();
-		String response = "";
-		
-		try {
-			ServletFileUpload upload = new ServletFileUpload();
-			res.setContentType("text/plain");
-
-			FileItemIterator iterator = upload.getItemIterator(req);
-
-			ImageEntry image = new ImageEntry();
-
-			while (iterator.hasNext()) {
-				FileItemStream item = iterator.next();
-				InputStream stream = item.openStream();
-
-				if (item.isFormField()) {
-					String key = item.getFieldName();
-					String value = Streams.asString(stream);
-					log.info("Form field: " + key + ", value = " + value);
-
-					if (key.equals("parentKeyId")) {
-						image.setParentKeyId(Long.parseLong(value));
-					} else if (key.equals("type")) {
-						image.setType(Byte.parseByte(value));
-					}
-				} else {
-					log.info("File: " + item.getFieldName() + ", key = " + item.getName());
-
-					String contentType = item.getContentType();
-
-					image.setImageType(contentType);
-					image.setImage(ByteStreams.toByteArray(stream));
-				}
-			}
-
-			if (image.getParentKeyId() > 0) {
-				
-				Key imageKey = ImageHelper.saveEntry(image);
-				image.setKey(imageKey);
-
-				// add the new image key id to the parent business or queue
-				if (image.getType() == ImageEntry.TYPE_LOGO) {
-					BusinessEntry businessEntry = BusinessHelper.getEntryByKeyId(image.getParentKeyId());
-					if (businessEntry != null) {
-						businessEntry.setLogoImageKeyId(image.getKey().getId());
-					} else {
-						throw new Exception("Can't find parent business with Id: " + image.getParentKeyId());
-					}
-					BusinessHelper.saveEntry(businessEntry);
-				} else {
-					QueueEntry queueEntry = QueueHelper.getEntryByKeyId(image.getParentKeyId());
-					if (queueEntry != null) {
-						queueEntry.setPhotoImageKeyId(image.getKey().getId());
-					} else {
-						throw new Exception("Can't find parent queue with Id: " + image.getParentKeyId());
-					}
-					QueueHelper.saveEntry(queueEntry);
-				}
-				
-				// remove the image data to use the same object as response
-				image.setImage(null);
-				
-				responseObject.setContent(image);
-				response = responseObject.toJSON();
-			} else {
-				throw new Exception("Invalid parentKeyId specified");
-			}
-		} catch (Exception e) {
-			responseObject.setException(e);
-			response = responseObject.toJSON();
-			e.printStackTrace();
-		}
-		
-		res.setContentType("application/json");
-		res.addHeader("Access-Control-Allow-Origin", "*");
+    private static final Logger log = Logger.getLogger(ImageServlet.class.getName());
+
+    @Override
+    public void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOException, ServletException {
+
+        String requestUrl = req.getRequestURL().toString();
+
+        try {
+            // image request pattern: .../image/[imageKeyId]/[size].jpg
+
+            String imageSizeString = ParserHelper.getStringAfter("/", req.getPathInfo(), ParserHelper.MODE_LAST_LAST);
+            if (imageSizeString.contains(".png")) {
+                imageSizeString = ParserHelper.getStringBefore(".png", imageSizeString);
+            } else if (imageSizeString.contains(".jpg")) {
+                imageSizeString = ParserHelper.getStringBefore(".jpg", imageSizeString);
+            } else {
+                throw new Exception("Unknown file type requested");
+            }
+
+            String imageKeyIdParam = ParserHelper.getStringBefore("/" + imageSizeString, req.getPathInfo(), ParserHelper.MODE_LAST_LAST);
+            imageKeyIdParam = ParserHelper.getStringAfter("/", imageKeyIdParam, ParserHelper.MODE_LAST_LAST);
+            long imageKeyId = Long.parseLong(imageKeyIdParam);
+
+            if (imageKeyId < 0) {
+                throw new Exception("Image key ID is invalid");
+            }
+
+            ImageQuery imageQuery = new ImageQuery();
+            ImageEntry image = imageQuery.getImageByKeyId(imageKeyId);
+
+            if (image.getImageType() == null || image.getImage() == null) {
+                // image = EntryManager.fetchImageFromUrl(image.getUrl());
+                throw new Exception("Image data unavailable");
+            }
+
+            resp.setContentType(image.getImageType());
+            resp.getOutputStream().write(ImageHelper.resizeImage(image.getImage(), imageSizeString));
+        } catch (Exception e) {
+            resp.sendRedirect("/static/images/not_found.jpg");
+        }
+    }
+
+    @Override
+    public void doPost(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException {
+        ApiResponse responseObject = new ApiResponse();
+        String response = "";
+
+        try {
+            ServletFileUpload upload = new ServletFileUpload();
+            res.setContentType("text/plain");
+
+            FileItemIterator iterator = upload.getItemIterator(req);
+
+            ImageEntry image = new ImageEntry();
+
+            while (iterator.hasNext()) {
+                FileItemStream item = iterator.next();
+                InputStream stream = item.openStream();
+
+                if (item.isFormField()) {
+                    String key = item.getFieldName();
+                    String value = Streams.asString(stream);
+                    log.info("Form field: " + key + ", value = " + value);
+
+                    if (key.equals("parentKeyId")) {
+                        image.setParentKeyId(Long.parseLong(value));
+                    } else if (key.equals("type")) {
+                        image.setType(Byte.parseByte(value));
+                    }
+                } else {
+                    log.info("File: " + item.getFieldName() + ", key = " + item.getName());
+
+                    String contentType = item.getContentType();
+
+                    image.setImageType(contentType);
+                    image.setImage(ByteStreams.toByteArray(stream));
+                }
+            }
+
+            if (image.getParentKeyId() > 0) {
+
+                Key imageKey = ImageHelper.saveEntry(image);
+                image.setKey(imageKey);
+
+                // add the new image key id to the parent business or queue
+                if (image.getType() == ImageEntry.TYPE_LOGO) {
+                    BusinessEntry businessEntry = BusinessHelper.getEntryByKeyId(image.getParentKeyId());
+                    if (businessEntry != null) {
+                        businessEntry.setLogoImageKeyId(image.getKey().getId());
+                    } else {
+                        throw new Exception("Can't find parent business with Id: " + image.getParentKeyId());
+                    }
+                    BusinessHelper.saveEntry(businessEntry);
+                } else {
+                    QueueEntry queueEntry = QueueHelper.getEntryByKeyId(image.getParentKeyId());
+                    if (queueEntry != null) {
+                        queueEntry.setPhotoImageKeyId(image.getKey().getId());
+                    } else {
+                        throw new Exception("Can't find parent queue with Id: " + image.getParentKeyId());
+                    }
+                    QueueHelper.saveEntry(queueEntry);
+                }
+
+                // remove the image data to use the same object as response
+                image.setImage(null);
+
+                responseObject.setContent(image);
+                response = responseObject.toJSON();
+            } else {
+                throw new Exception("Invalid parentKeyId specified");
+            }
+        } catch (Exception e) {
+            responseObject.setException(e);
+            response = responseObject.toJSON();
+            e.printStackTrace();
+        }
+
+        res.setContentType("application/json");
+        res.addHeader("Access-Control-Allow-Origin", "*");
         res.getWriter().write(response);
         res.getWriter().flush();
         res.getWriter().close();
-	}
+    }
 
 }