notification service client support

account-service/Dockerfile

@@ -2,4 +2,4 @@ FROM java:8-jre
 ADD ./target/account-service.jar /app/
 CMD ["java", "-jar", "/app/account-service.jar"]
 
-EXPOSE 7000
+EXPOSE 6000

account-service/src/main/java/com/piggymetrics/account/domain/Account.java

@@ -15,8 +15,6 @@
 public class Account {
 
 	@Id
-	@NotNull
-	@Length(min = 3, max = 20)
 	private String name;
 
 	private Date lastSeen;

account-service/src/main/java/com/piggymetrics/account/domain/User.java

@@ -7,7 +7,7 @@
 public class User {
 
 	@NotNull
-	@Length(min = 2, max = 20)
+	@Length(min = 3, max = 20)
 	private String username;
 
 	@NotNull

config/src/main/resources/shared/account-service.yml

@@ -18,4 +18,4 @@ spring:
 
 server:
   context-path: /accounts
-  port: 7000
+  port: 6000

config/src/main/resources/shared/notification-service.yml

@@ -9,7 +9,7 @@ security:
 
 server:
   context-path: /notifications
-  port: 9000
+  port: 8000
 
 remind:
   cron: 0 0 0 * * *

config/src/main/resources/shared/statistics-service.yml

@@ -18,7 +18,7 @@ spring:
 
 server:
   context-path: /statistics
-  port: 8000
+  port: 7000
 
 rates:
   url: http://api.fixer.io

docker-compose.dev.yml

@@ -34,7 +34,7 @@ services:
     environment:
       MONGODB_PASSWORD: dev-password
     ports:
-      - 27000:27017
+      - 25000:27017
 
   account-service:
     environment:
@@ -43,13 +43,13 @@ services:
       ACCOUNT_SERVICE_PASSWORD: dev-password
     build: account-service
     ports:
-      - 7000:7000
+      - 6000:6000
 
   account-mongodb:
     environment:
       MONGODB_PASSWORD: dev-password
     ports:
-      - 27001:27017
+      - 26000:27017
 
   statistics-service:
     environment:
@@ -58,13 +58,13 @@ services:
       STATISTICS_SERVICE_PASSWORD: dev-password
     build: statistics-service
     ports:
-      - 8000:8000
+      - 7000:7000
 
   statistics-mongodb:
     environment:
       MONGODB_PASSWORD: dev-password
     ports:
-      - 27002:27017
+      - 27000:27017
 
   notification-service:
     environment:
@@ -73,10 +73,10 @@ services:
       NOTIFICATION_SERVICE_PASSWORD: dev-password
     build: notification-service
     ports:
-      - 9000:9000
+      - 8000:8000
 
   notification-mongodb:
     environment:
       MONGODB_PASSWORD: dev-password
     ports:
-      - 27003:27017
+      - 28000:27017

notification-service/Dockerfile

@@ -2,4 +2,4 @@ FROM java:8-jre
 ADD ./target/notification-service.jar /app/
 CMD ["java", "-jar", "/app/notification-service.jar"]
 
-EXPOSE 8888
+EXPOSE 8000

notification-service/src/main/java/com/piggymetrics/notification/domain/NotificationSettings.java

@@ -8,6 +8,7 @@ public class NotificationSettings {
 	@NotNull
 	private Boolean active;
 
+	@NotNull
 	private Frequency frequency;
 
 	private Date lastNotified;

notification-service/src/main/java/com/piggymetrics/notification/service/RecipientServiceImpl.java

@@ -29,8 +29,7 @@ public Recipient findByAccountName(String accountName) {
 	@Override
 	public Recipient save(String accountName, Recipient recipient) {
 
-		Assert.isTrue(accountName.equals(recipient.getAccountName()));
-
+		recipient.setAccountName(accountName);
 		recipient.getScheduledNotifications().values()
 				.forEach(settings -> {
 					if (settings.getLastNotified() == null) {

notification-service/src/test/java/com/piggymetrics/notification/service/RecipientServiceImplTest.java

@@ -64,24 +64,17 @@ public void shouldSaveRecipient() {
 		backup.setLastNotified(new Date());
 
 		Recipient recipient = new Recipient();
-		recipient.setAccountName("test");
 		recipient.setEmail("[email protected]");
 		recipient.setScheduledNotifications(ImmutableMap.of(
 				NotificationType.BACKUP, backup,
 				NotificationType.REMIND, remind
 		));
 
-		Recipient saved = recipientService.save(recipient.getAccountName(), recipient);
-		verify(repository).save(recipient);
+		Recipient saved = recipientService.save("test", recipient);
 
+		verify(repository).save(recipient);
 		assertNotNull(saved.getScheduledNotifications().get(NotificationType.REMIND).getLastNotified());
-	}
-
-	@Test(expected = IllegalArgumentException.class)
-	public void shouldFailToSaveRecipientWhenGivenAccountNameAndRecepientNameNotMatch() {
-		Recipient recipient = new Recipient();
-		recipient.setAccountName("test2");
-		recipientService.save("test1", recipient);
+		assertEquals("test", saved.getAccountName());
 	}
 
 	@Test