TransactionParticipantService.add(): return id after creation.

Prerequisite for #695

No functional changes.

Author: php-coder

src/main/java/ru/mystamps/web/dao/TransactionParticipantDao.java

@@ -24,7 +24,7 @@
 import ru.mystamps.web.dao.dto.EntityWithParentDto;
 
 public interface TransactionParticipantDao {
-	void add(AddParticipantDbDto participant);
+	Integer add(AddParticipantDbDto participant);
 	List<EntityWithParentDto> findBuyersWithParents();
 	List<EntityWithParentDto> findSellersWithParents();
 	Integer findSellerId(String name, String url);

src/main/java/ru/mystamps/web/dao/impl/JdbcTransactionParticipantDao.java

@@ -25,7 +25,10 @@
 
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.dao.EmptyResultDataAccessException;
+import org.springframework.jdbc.core.namedparam.MapSqlParameterSource;
 import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate;
+import org.springframework.jdbc.support.GeneratedKeyHolder;
+import org.springframework.jdbc.support.KeyHolder;
 
 import lombok.RequiredArgsConstructor;
 
@@ -55,21 +58,29 @@ public class JdbcTransactionParticipantDao implements TransactionParticipantDao
 	private String findAllGroupsSql;
 
 	@Override
-	public void add(AddParticipantDbDto participant) {
+	public Integer add(AddParticipantDbDto participant) {
 		Map<String, Object> params = new HashMap<>();
 		params.put("name", participant.getName());
 		params.put("url", participant.getUrl());
 		params.put("group_id", participant.getGroupId());
 		params.put("buyer", participant.getBuyer());
 		params.put("seller", participant.getSeller());
 
-		int affected = jdbcTemplate.update(addParticipantSql, params);
+		KeyHolder holder = new GeneratedKeyHolder();
+		
+		int affected = jdbcTemplate.update(
+			addParticipantSql,
+			new MapSqlParameterSource(params),
+			holder
+		);
 
 		Validate.validState(
 			affected == 1,
 			"Unexpected number of affected rows after creation of participant: %d",
 			affected
 		);
+		
+		return Integer.valueOf(holder.getKey().intValue());
 	}
 
 	@Override

src/main/java/ru/mystamps/web/service/TransactionParticipantService.java

@@ -24,7 +24,7 @@
 import ru.mystamps.web.service.dto.AddParticipantDto;
 
 public interface TransactionParticipantService {
-	void add(AddParticipantDto dto);
+	Integer add(AddParticipantDto dto);
 	List<EntityWithParentDto> findBuyersWithParents();
 	List<EntityWithParentDto> findSellersWithParents();
 	Integer findSellerId(String name, String url);

src/main/java/ru/mystamps/web/service/TransactionParticipantServiceImpl.java

@@ -46,7 +46,7 @@ public class TransactionParticipantServiceImpl implements TransactionParticipant
 	@Override
 	@Transactional
 	@PreAuthorize(HasAuthority.ADD_PARTICIPANT)
-	public void add(AddParticipantDto dto) {
+	public Integer add(AddParticipantDto dto) {
 		Validate.isTrue(dto != null, "DTO must be non null");
 		Validate.isTrue(dto.getName() != null, "Name must be non null");
 		Validate.isTrue(dto.getBuyer() != null, "Buyer flag must be non null");
@@ -59,9 +59,11 @@ public void add(AddParticipantDto dto) {
 		participant.setBuyer(dto.getBuyer());
 		participant.setSeller(dto.getSeller());
 
-		transactionParticipantDao.add(participant);
+		Integer id = transactionParticipantDao.add(participant);
 
-		log.info("Participant has been created ({})", participant);
+		log.info("Participant #{} has been created ({})", id, participant);
+		
+		return id;
 	}
 
 	@Override

src/test/groovy/ru/mystamps/web/service/TransactionParticipantServiceImplTest.groovy

@@ -96,6 +96,7 @@ class TransactionParticipantServiceImplTest extends Specification {
 			Integer expectedGroupId = nullOr(Random.id())
 			Boolean expectedBuyer   = bool()
 			Boolean expectedSeller  = bool()
+			Integer expectedResult  = Random.id()
 		and:
 			AddParticipantForm form = new AddParticipantForm()
 			form.setName(expectedName)
@@ -104,7 +105,7 @@ class TransactionParticipantServiceImplTest extends Specification {
 			form.setBuyer(expectedBuyer)
 			form.setSeller(expectedSeller)
 		when:
-			service.add(form)
+			Integer result = service.add(form)
 		then:
 			1 * transactionParticipantDao.add({ AddParticipantDbDto participant ->
 				assert participant?.name == expectedName
@@ -113,7 +114,9 @@ class TransactionParticipantServiceImplTest extends Specification {
 				assert participant?.buyer == expectedBuyer
 				assert participant?.seller == expectedSeller
 				return true
-			})
+			}) >> expectedResult
+		and:
+			result == expectedResult
 	}
 
 	//