Skip to content

Slack Logging #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Steppschuh merged 3 commits into from
Sep 4, 2016
Merged

Slack Logging #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f60ae79
Added logging
Steppschuh Sep 4, 2016
e94ebe7
Merge branch 'dev' into logging
Steppschuh Sep 4, 2016
0c1c170
Code formatting
Steppschuh Sep 4, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
240 changes: 120 additions & 120 deletions IntelliQ/backend/src/main/java/com/intelliq/appengine/ImageServlet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}
}

}
64 changes: 32 additions & 32 deletions IntelliQ/backend/src/main/java/com/intelliq/appengine/MergeHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,36 +4,36 @@

public class MergeHelper {

public static String mergeStrings(String existingValue, String newValue) {
if (!ParserHelper.containsAnyValue(existingValue)) {
return newValue;
} else {
return existingValue;
}
}
public static List<String> mergeListsOfString(List<String> existingList, List<String> newList) {
if (existingList == null || existingList.size() == 0) {
return newList;
}
for (String newString: newList) {
if (!existingList.contains(newString)) {
existingList.add(newString);
}
}
return existingList;
}
public static List<Long> mergeListsOfLong(List<Long> existingList, List<Long> newList) {
if (existingList == null || existingList.size() == 0) {
return newList;
}
for (long newValue: newList) {
if (!existingList.contains(newValue)) {
existingList.add(newValue);
}
}
return existingList;
}
public static String mergeStrings(String existingValue, String newValue) {
if (!ParserHelper.containsAnyValue(existingValue)) {
return newValue;
} else {
return existingValue;
}
}

public static List<String> mergeListsOfString(List<String> existingList, List<String> newList) {
if (existingList == null || existingList.size() == 0) {
return newList;
}
for (String newString : newList) {
if (!existingList.contains(newString)) {
existingList.add(newString);
}
}
return existingList;
}

public static List<Long> mergeListsOfLong(List<Long> existingList, List<Long> newList) {
if (existingList == null || existingList.size() == 0) {
return newList;
}
for (long newValue : newList) {
if (!existingList.contains(newValue)) {
existingList.add(newValue);
}
}
return existingList;
}

}
Loading