JdbcUsersActivationDao.add(): change argument from UsersActivation to AddUsersActivationDbDto.

php-coder · php-coder · commit 1a9f38f6b049 · 2015-10-17T00:21:14.000+02:00
Addressed to #120 No functional changes.
diff --git a/src/main/java/ru/mystamps/web/dao/JdbcUsersActivationDao.java b/src/main/java/ru/mystamps/web/dao/JdbcUsersActivationDao.java
@@ -17,11 +17,12 @@
  */
 package ru.mystamps.web.dao;
 
+import ru.mystamps.web.dao.dto.AddUsersActivationDbDto;
 import ru.mystamps.web.entity.UsersActivation;
 
 public interface JdbcUsersActivationDao {
 	long countByActivationKey(String activationKey);
 	void removeByActivationKey(String activationKey);
-	void add(UsersActivation activation);
+	void add(AddUsersActivationDbDto activation);
 	UsersActivation findByActivationKey(String activationKey);
 }
diff --git a/src/main/java/ru/mystamps/web/dao/dto/AddUsersActivationDbDto.java b/src/main/java/ru/mystamps/web/dao/dto/AddUsersActivationDbDto.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright (C) 2009-2015 Slava Semushin <slava.semushin@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+package ru.mystamps.web.dao.dto;
+
+import java.util.Date;
+import java.util.Locale;
+
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class AddUsersActivationDbDto {
+	private String activationKey;
+	private String email;
+	private String lang;
+	private Date createdAt;
+	
+	public Locale getLocale() {
+		return new Locale(lang);
+	}
+	
+}
diff --git a/src/main/java/ru/mystamps/web/dao/impl/JdbcUsersActivationDaoImpl.java b/src/main/java/ru/mystamps/web/dao/impl/JdbcUsersActivationDaoImpl.java
@@ -29,6 +29,7 @@
 import lombok.RequiredArgsConstructor;
 
 import ru.mystamps.web.dao.JdbcUsersActivationDao;
+import ru.mystamps.web.dao.dto.AddUsersActivationDbDto;
 import ru.mystamps.web.entity.UsersActivation;
 
 @SuppressWarnings("PMD.AvoidDuplicateLiterals")
@@ -83,7 +84,7 @@ public void removeByActivationKey(String activationKey) {
 	}
 	
 	@Override
-	public void add(UsersActivation activation) {
+	public void add(AddUsersActivationDbDto activation) {
 		Map<String, Object> params = new HashMap<>();
 		params.put("activation_key", activation.getActivationKey());
 		params.put("email", activation.getEmail());
diff --git a/src/main/java/ru/mystamps/web/service/MailService.java b/src/main/java/ru/mystamps/web/service/MailService.java
@@ -17,8 +17,8 @@
  */
 package ru.mystamps.web.service;
 
-import ru.mystamps.web.entity.UsersActivation;
+import ru.mystamps.web.dao.dto.AddUsersActivationDbDto;
 
 public interface MailService {
-	void sendActivationKeyToUser(UsersActivation activation);
+	void sendActivationKeyToUser(AddUsersActivationDbDto activation);
 }
diff --git a/src/main/java/ru/mystamps/web/service/MailServiceImpl.java b/src/main/java/ru/mystamps/web/service/MailServiceImpl.java
@@ -38,7 +38,7 @@
 import lombok.RequiredArgsConstructor;
 
 import ru.mystamps.web.Url;
-import ru.mystamps.web.entity.UsersActivation;
+import ru.mystamps.web.dao.dto.AddUsersActivationDbDto;
 import ru.mystamps.web.service.exception.EmailSendingException;
 
 @RequiredArgsConstructor
@@ -52,7 +52,7 @@ public class MailServiceImpl implements MailService {
 	
 	@Override
 	@Async
-	public void sendActivationKeyToUser(UsersActivation activation) {
+	public void sendActivationKeyToUser(AddUsersActivationDbDto activation) {
 		Validate.isTrue(activation != null, "Activation must be non null");
 		Validate.isTrue(activation.getEmail() != null, "E-mail must be non null");
 		Validate.isTrue(activation.getLang() != null, "Language must be non null");
@@ -105,7 +105,7 @@ public void prepare(MimeMessage mimeMessage) throws Exception {
 		}
 	}
 	
-	private String getTextOfActivationMail(UsersActivation activation) {
+	private String getTextOfActivationMail(AddUsersActivationDbDto activation) {
 		String template = messageSource.getMessage("activation.text", null, activation.getLocale());
 		
 		String activationUrl =
@@ -120,7 +120,7 @@ private String getTextOfActivationMail(UsersActivation activation) {
 		return substitutor.replace(template);
 	}
 	
-	private String getSubjectOfActivationMail(UsersActivation activation) {
+	private String getSubjectOfActivationMail(AddUsersActivationDbDto activation) {
 		return messageSource.getMessage("activation.subject", null, activation.getLocale());
 	}
 	
diff --git a/src/main/java/ru/mystamps/web/service/UsersActivationServiceImpl.java b/src/main/java/ru/mystamps/web/service/UsersActivationServiceImpl.java
@@ -31,6 +31,7 @@
 import lombok.RequiredArgsConstructor;
 
 import ru.mystamps.web.dao.JdbcUsersActivationDao;
+import ru.mystamps.web.dao.dto.AddUsersActivationDbDto;
 import ru.mystamps.web.entity.UsersActivation;
 import ru.mystamps.web.service.dto.RegisterAccountDto;
 import ru.mystamps.web.support.togglz.Features;
@@ -49,7 +50,7 @@ public void add(RegisterAccountDto dto, Locale lang) {
 		Validate.isTrue(dto != null, "DTO should be non null");
 		Validate.isTrue(dto.getEmail() != null, "Email should be non null");
 		
-		UsersActivation activation = new UsersActivation();
+		AddUsersActivationDbDto activation = new AddUsersActivationDbDto();
 		
 		activation.setActivationKey(generateActivationKey());
 		activation.setEmail(dto.getEmail());
diff --git a/src/test/groovy/ru/mystamps/web/service/UsersActivationServiceImplTest.groovy b/src/test/groovy/ru/mystamps/web/service/UsersActivationServiceImplTest.groovy
@@ -21,6 +21,7 @@ import spock.lang.Specification
 import spock.lang.Unroll
 
 import ru.mystamps.web.dao.JdbcUsersActivationDao
+import ru.mystamps.web.dao.dto.AddUsersActivationDbDto
 import ru.mystamps.web.entity.UsersActivation
 import ru.mystamps.web.model.RegisterAccountForm
 import ru.mystamps.web.tests.DateUtils
@@ -57,14 +58,14 @@ class UsersActivationServiceImplTest extends Specification {
 		when:
 			service.add(registrationForm, ANY_LOCALE)
 		then:
-			1 * usersActivationDao.add(_ as UsersActivation)
+			1 * usersActivationDao.add(_ as AddUsersActivationDbDto)
 	}
 	
 	def "add() should generate activation key"() {
 		when:
 			service.add(registrationForm, ANY_LOCALE)
 		then:
-			1 * usersActivationDao.add({ UsersActivation activation ->
+			1 * usersActivationDao.add({ AddUsersActivationDbDto activation ->
 				assert activation?.activationKey?.length() == UsersActivation.ACTIVATION_KEY_LENGTH
 				assert activation?.activationKey ==~ /^[\p{Lower}\p{Digit}]+$/
 				return true
@@ -78,7 +79,7 @@ class UsersActivationServiceImplTest extends Specification {
 			service.add(registrationForm, ANY_LOCALE)
 			service.add(registrationForm, ANY_LOCALE)
 		then:
-			2 * usersActivationDao.add({ UsersActivation activation ->
+			2 * usersActivationDao.add({ AddUsersActivationDbDto activation ->
 				passedArguments.add(activation?.activationKey)
 				return true
 			})
@@ -110,7 +111,7 @@ class UsersActivationServiceImplTest extends Specification {
 		when:
 			service.add(registrationForm, ANY_LOCALE)
 		then:
-			1 * usersActivationDao.add({ UsersActivation activation ->
+			1 * usersActivationDao.add({ AddUsersActivationDbDto activation ->
 				assert activation?.email == expectedEmail
 				return true
 			})
@@ -121,7 +122,7 @@ class UsersActivationServiceImplTest extends Specification {
 		when:
 			service.add(registrationForm, lang)
 		then:
-			1 * usersActivationDao.add({ UsersActivation activation ->
+			1 * usersActivationDao.add({ AddUsersActivationDbDto activation ->
 				assert activation?.lang == expectedLang
 				return true
 			})
@@ -135,7 +136,7 @@ class UsersActivationServiceImplTest extends Specification {
 		when:
 			service.add(registrationForm, ANY_LOCALE)
 		then:
-			1 * usersActivationDao.add({ UsersActivation activation ->
+			1 * usersActivationDao.add({ AddUsersActivationDbDto activation ->
 				assert DateUtils.roughlyEqual(activation?.createdAt, new Date())
 				return true
 			})
@@ -145,7 +146,7 @@ class UsersActivationServiceImplTest extends Specification {
 		when:
 			service.add(registrationForm, Locale.FRANCE)
 		then:
-			1 * mailService.sendActivationKeyToUser({ UsersActivation activation ->
+			1 * mailService.sendActivationKeyToUser({ AddUsersActivationDbDto activation ->
 				assert activation != null
 				assert activation.activationKey != null
 				assert activation.email == registrationForm.email

Original file line number	Diff line number	Diff line change
`@@ -17,8 +17,8 @@`
`17`	`17`	`*/`
`18`	`18`	`package ru.mystamps.web.service;`
`19`	`19`
`20`		`-import ru.mystamps.web.entity.UsersActivation;`
	`20`	`+import ru.mystamps.web.dao.dto.AddUsersActivationDbDto;`
`21`	`21`
`22`	`22`	`public interface MailService {`
`23`		`- void sendActivationKeyToUser(UsersActivation activation);`
	`23`	`+ void sendActivationKeyToUser(AddUsersActivationDbDto activation);`
`24`	`24`	`}`