resource representations, resource implementations, enhancend existin…

…g services, etc.

photoalbum-management/src/main/java/com/mgu/photoalbum/domain/Photo.java

@@ -11,6 +11,7 @@
 import org.joda.time.DateTimeZone;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -36,6 +37,8 @@ public static class PhotoBuilder {
 
  private String pathToThumbnail = StringUtils.EMPTY;
 
+ private String description = StringUtils.EMPTY;
+
  private List<String> tags = new ArrayList<>();
 
  public PhotoBuilder id(final String photoId) {
@@ -68,6 +71,11 @@ public PhotoBuilder pathToThumbnail(final String pathToThumbnail) {
  return this;
  }
 
+ public PhotoBuilder description(final String description) {
+ this.description = description;
+ return this;
+ }
+
  public PhotoBuilder tag(final String tag) {
  this.tags.add(tag);
  return this;
@@ -108,6 +116,9 @@ public Photo build() {
  @JsonProperty("pathToThumbnail")
  private String pathToThumbnail;
 
+ @JsonProperty("description")
+ private String description;
+
  @JsonProperty("tags")
  private List<String> tags = new ArrayList<>();
 
@@ -125,6 +136,7 @@ private Photo(final PhotoBuilder builder) {
  this.originalFilename = builder.originalFilename;
  this.pathToOriginal = builder.pathToOriginal;
  this.pathToThumbnail = builder.pathToThumbnail;
+ this.description = builder.description;
  this.tags.addAll(builder.tags);
  }
 
@@ -156,8 +168,17 @@ public String getPathToThumbnail() {
  return pathToThumbnail;
  }
 
+ public String getDescription() {
+ return this.description;
+ }
+
  public List<String> getTags() {
- return tags;
+ return Collections.unmodifiableList(tags);
+ }
+
+ public void describe(final String description) {
+ this.description = description;
+ this.lastModified = DateTime.now(DateTimeZone.UTC);
  }
 
  public void tag(final String tag) {

photoalbum-management/src/main/java/com/mgu/photoalbum/service/AlbumQueryService.java

@@ -2,7 +2,11 @@
 
 import com.mgu.photoalbum.domain.Album;
 
+import java.util.List;
+
 public interface AlbumQueryService {
 
- Album byId(final String id);
+ Album albumById(final String id);
+
+ List<Album> albumsByOwner(final String ownerId);
 }

photoalbum-management/src/main/java/com/mgu/photoalbum/service/AlbumService.java

@@ -5,6 +5,7 @@
 import com.mgu.photoalbum.identity.IdGenerator;
 import com.mgu.photoalbum.storage.AlbumRepository;
 
+import java.util.List;
 import java.util.function.Supplier;
 
 public class AlbumService implements AlbumCommandService, AlbumQueryService {
@@ -54,11 +55,16 @@ public void deleteAlbum(final String id) {
  }
 
  @Override
- public Album byId(final String id) {
+ public Album albumById(final String id) {
  if (!repository.contains(id)) {
  throw new AlbumDoesNotExistException(id);
  }
  final Album album = repository.get(id);
  return album;
  }
+
+ @Override
+ public List<Album> albumsByOwner(String ownerId) {
+ return null;
+ }
 }

photoalbum-management/src/main/java/com/mgu/photoalbum/service/ImageDoesNotExistException.java

@@ -0,0 +1,17 @@
+package com.mgu.photoalbum.service;
+
+import com.mgu.photoalbum.exception.PhotoalbumException;
+
+public class ImageDoesNotExistException extends PhotoalbumException {
+
+ private static final String ERROR_MESSAGE = "The image file for photo with ID %s does not exist on the filesystem.";
+
+ public ImageDoesNotExistException(final String photoId) {
+ super(String.format(ERROR_MESSAGE, photoId));
+ }
+
+ @Override
+ public String getErrorCode() {
+ return "P004";
+ }
+}

photoalbum-management/src/main/java/com/mgu/photoalbum/service/PhotoCommandService.java

@@ -8,7 +8,5 @@ public interface PhotoCommandService {
 
  void deletePhoto(String photoId);
 
- void replaceTags(String photoId, String tag);
-
- void replaceTags(String photoId, List<String> tags);
+ void updateMetadata(String photoId, String description, List<String> tags);
 }

photoalbum-management/src/main/java/com/mgu/photoalbum/service/PhotoQueryService.java

@@ -2,11 +2,17 @@
 
 import com.mgu.photoalbum.domain.Photo;
 
+import java.util.List;
+
 public interface PhotoQueryService {
 
  byte[] originalById(String id); // byte[] originalById(PhotoId identity)
 
  byte[] thumbnailById(String id);
 
- Photo byId(String id);
+ Photo photoById(String id);
+
+ List<Photo> photosByAlbumAndTags(String albumId, List<String> tags);
+
+ List<Photo> search(String albumId, List<String> tags, int offset, int pageSize);
 }

photoalbum-management/src/main/java/com/mgu/photoalbum/service/PhotoService.java

@@ -11,14 +11,13 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.awt.*;
+import java.awt.Dimension;
 import java.awt.image.BufferedImage;
 import java.nio.file.Path;
-import java.util.Arrays;
 import java.util.List;
 import java.util.function.Supplier;
 
-public class PhotoService implements PhotoCommandService {
+public class PhotoService implements PhotoCommandService, PhotoQueryService {
 
  private static final Logger LOGGER = LoggerFactory.getLogger(PhotoService.class);
 
@@ -35,7 +34,13 @@ public class PhotoService implements PhotoCommandService {
  private final Supplier<String> photoIdGenerator;
 
  @Inject
- public PhotoService(final PhotoRepository repository, final PathScheme pathScheme, final PathAdapter pathAdapter, final InputStreamAdapter inputStreamAdapter, final IdGenerator idGenerator, final ImageScaler scaler) {
+ public PhotoService(
+ final PhotoRepository repository,
+ final PathScheme pathScheme,
+ final PathAdapter pathAdapter,
+ final InputStreamAdapter inputStreamAdapter,
+ final IdGenerator idGenerator,
+ final ImageScaler scaler) {
  this.repository = repository;
  this.pathAdapter = pathAdapter;
  this.inputStreamAdapter = inputStreamAdapter;
@@ -85,7 +90,7 @@ private String generateUniquePhotoId() {
 
  private BufferedImage generateThumbnail(final Path pathToUnscaledImage) {
  final byte[] unscaledImage = pathAdapter.readBytes(pathToUnscaledImage);
- return scaler.scale(unscaledImage, new Dimension(200, 150));
+ return scaler.scale(unscaledImage, new Dimension(550, 370));
  }
 
  @Override
@@ -100,22 +105,70 @@ public void deletePhoto(final String photoId) {
  }
 
  @Override
- public void replaceTags(final String photoId, final String tag) {
- replaceTags(photoId, Arrays.asList(tag));
- }
-
- @Override
- public void replaceTags(final String photoId, final List<String> tags) {
+ public void updateMetadata(final String photoId, final String description, final List<String> tags) {
  if (!repository.contains(photoId)) {
  throw new PhotoDoesNotExistException(photoId);
  }
  final Photo photo = repository.get(photoId);
+ photo.describe(description);
  photo.untag();
  photo.tag(tags);
  try {
  repository.update(photo);
  } catch (UpdateConflictException e) {
- throw new UnableToReplaceTagsException(photoId, tags);
+ throw new UnableToUpdateMetadata(photoId, description, tags);
+ }
+ }
+
+ @Override
+ public byte[] originalById(final String photoId) {
+
+ if (!repository.contains(photoId)) {
+ throw new PhotoDoesNotExistException(photoId);
  }
+
+ final Photo photo = repository.get(photoId);
+ final Path pathToOriginal = pathScheme.constructPathToOriginal(photo.getOwnerId(), photo.getAlbumId(), photoId);
+
+ if (!pathAdapter.exists(pathToOriginal)) {
+ throw new ImageDoesNotExistException(photoId);
+ }
+
+ return pathAdapter.readBytes(pathToOriginal);
+ }
+
+ @Override
+ public byte[] thumbnailById(final String photoId) {
+
+ if (!repository.contains(photoId)) {
+ throw new PhotoDoesNotExistException(photoId);
+ }
+
+ final Photo photo = repository.get(photoId);
+ final Path pathToThumbnail = pathScheme.constructPathToThumbnail(photo.getOwnerId(), photo.getAlbumId(), photoId);
+
+ if (!pathAdapter.exists(pathToThumbnail)) {
+ throw new ImageDoesNotExistException(photoId);
+ }
+
+ return pathAdapter.readBytes(pathToThumbnail);
+ }
+
+ @Override
+ public Photo photoById(final String photoId) {
+ if (!repository.contains(photoId)) {
+ throw new PhotoDoesNotExistException(photoId);
+ }
+ return repository.get(photoId);
+ }
+
+ @Override
+ public List<Photo> photosByAlbumAndTags(final String albumId, final List<String> tags) {
+ return null;
+ }
+
+ @Override
+ public List<Photo> search(final String albumId, final List<String> tags, final int offset, final int pageSize) {
+ return null;
  }
 }

photoalbum-management/src/main/java/com/mgu/photoalbum/service/UnableToUpdateMetadata.java

@@ -0,0 +1,20 @@
+package com.mgu.photoalbum.service;
+
+import com.mgu.photoalbum.exception.PhotoalbumException;
+import org.apache.commons.lang3.StringUtils;
+
+import java.util.List;
+
+public class UnableToUpdateMetadata extends PhotoalbumException {
+
+ private static final String ERROR_MESSAGE = "Unable to set description to %s and replace existing tags by %s for photo with ID %s.";
+
+ public UnableToUpdateMetadata(final String photoId, final String description, final List<String> tags) {
+ super(String.format(ERROR_MESSAGE, description, StringUtils.join(tags, ","), photoId));
+ }
+
+ @Override
+ public String getErrorCode() {
+ return "P003";
+ }
+}

photoalbum-security/pom.xml

@@ -24,6 +24,16 @@
  <artifactId>photoalbum-user-management</artifactId>
  <version>${photoalbum.version}</version>
  </dependency>
+ <dependency>
+ <groupId>com.mgu.photoalbum</groupId>
+ <artifactId>photoalbum-common</artifactId>
+ <version>${photoalbum.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.mgu.photoalbum</groupId>
+ <artifactId>photoalbum-management</artifactId>
+ <version>${photoalbum.version}</version>
+ </dependency>
  <!-- Utilities -->
  <dependency>
  <groupId>commons-codec</groupId>