Country,Series: added createdBy/updatedBy fields.

Added dependency to PowerMock because I use it in unit tests (for
mocking static methods). Also due to issue #398 I downgrade Mockito to
1.9.0

@see http://code.google.com/p/powermock/issues/detail?id=398

More details about PowerMock:
- http://code.google.com/p/powermock/wiki/MockitoUsage13
- http://code.google.com/p/powermock/wiki/TestNG_usage

Fixed #133

Author: php-coder

pom.xml

@@ -24,8 +24,9 @@
 		<javax.validation.version>1.1.0.Alpha1</javax.validation.version>
 
 		<testng.version>6.7</testng.version>
-		<mockito.version>1.9.5-rc1</mockito.version>
+		<mockito.version>1.9.0</mockito.version>
 		<fest.assert.version>2.0M6</fest.assert.version>
+		<powermock.version>1.4.12</powermock.version>
 
 		<java.version>1.6</java.version>
 
@@ -222,6 +223,20 @@
 			<scope>test</scope>
 		</dependency>
 
+		<dependency>
+			<groupId>org.powermock</groupId>
+			<artifactId>powermock-api-mockito</artifactId>
+			<version>${powermock.version}</version>
+			<scope>test</scope>
+		</dependency>
+		
+		<dependency>
+			<groupId>org.powermock</groupId>
+			<artifactId>powermock-module-testng</artifactId>
+			<version>${powermock.version}</version>
+			<scope>test</scope>
+		</dependency>
+		
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-test</artifactId>

src/env/dev/WEB-INF/classes/mysql-scheme.sql

@@ -8,6 +8,8 @@
         name varchar(50) not null unique,
         updated_at datetime not null,
         version bigint not null,
+        created_by integer not null,
+        updated_by integer not null,
         primary key (id)
     ) ENGINE=InnoDB;
 
@@ -117,6 +119,18 @@
         primary key (id)
     ) ENGINE=InnoDB;
 
+    alter table countries 
+        add index FK509F9AB4E7A879A3 (created_by), 
+        add constraint FK509F9AB4E7A879A3 
+        foreign key (created_by) 
+        references users (id);
+
+    alter table countries 
+        add index FK509F9AB4846862F0 (updated_by), 
+        add constraint FK509F9AB4846862F0 
+        foreign key (updated_by) 
+        references users (id);
+
     alter table series 
         add index FKCA01FE77DF85B0F0 (country_id), 
         add constraint FKCA01FE77DF85B0F0 

src/env/test/WEB-INF/classes/h2-scheme.sql

@@ -8,6 +8,8 @@
         name varchar(50) not null unique,
         updated_at timestamp not null,
         version bigint not null,
+        created_by integer not null,
+        updated_by integer not null,
         primary key (id)
     );
 
@@ -117,6 +119,16 @@
         primary key (id)
     );
 
+    alter table countries 
+        add constraint FK509F9AB4E7A879A3 
+        foreign key (created_by) 
+        references users;
+
+    alter table countries 
+        add constraint FK509F9AB4846862F0 
+        foreign key (updated_by) 
+        references users;
+
     alter table series 
         add constraint FKCA01FE77DF85B0F0 
         foreign key (country_id) 

src/env/test/WEB-INF/classes/test-data.sql

@@ -1,8 +1,9 @@
 --
 -- Auto-generated by Maven, based on values from src/env/test/WEB-INF/classes/spring/test-data.properties
 --
-INSERT INTO users(login, name, email, registered_at, activated_at, hash, salt)
+INSERT INTO users(id, login, name, email, registered_at, activated_at, hash, salt)
 VALUES (
+	1,
 	'@valid_user_login@',
 	'@valid_user_name@',
 	'coder@rock.home',
@@ -26,10 +27,12 @@ VALUES(
 	NOW()
 );
 
-INSERT INTO countries(name, created_at, updated_at, version)
+INSERT INTO countries(name, created_at, created_by, updated_at, updated_by, version)
 VALUES(
 	'@valid_country_name@',
 	NOW(),
+	1,
 	NOW(),
+	1,
 	0
 );

src/main/java/ru/mystamps/web/entity/Country.java

@@ -24,6 +24,8 @@
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
 import javax.persistence.Table;
 import javax.persistence.Temporal;
 import javax.persistence.TemporalType;
@@ -52,10 +54,18 @@ public class Country {
 	@Column(name = "created_at", nullable = false)
 	private Date createdAt;
 
+	@ManyToOne(optional = false)
+	@JoinColumn(name = "created_by", nullable = false)
+	private User createdBy;
+	
 	@Temporal(TemporalType.TIMESTAMP)
 	@Column(name = "updated_at", nullable = false)
 	private Date updatedAt;
 
+	@ManyToOne(optional = false)
+	@JoinColumn(name = "updated_by", nullable = false)
+	private User updatedBy;
+	
 	@Setter(AccessLevel.PROTECTED)
 	@Version
 	@Column(nullable = false)

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

@@ -27,8 +27,10 @@
 import org.springframework.transaction.annotation.Transactional;
 
 import static com.google.common.base.Preconditions.checkArgument;
+import static com.google.common.base.Preconditions.checkState;
 
 import ru.mystamps.web.entity.Country;
+import ru.mystamps.web.entity.User;
 import ru.mystamps.web.dao.CountryDao;
 
 @Service
@@ -37,6 +39,9 @@ public class CountryService {
 	@Inject
 	private CountryDao countryDao;
 
+	@Inject
+	private UserService userService;
+	
 	@Transactional
 	@PreAuthorize("hasAuthority('ROLE_USER')")
 	public Country add(final String countryName) {
@@ -49,6 +54,11 @@ public Country add(final String countryName) {
 		country.setCreatedAt(now);
 		country.setUpdatedAt(now);
 
+		final User currentUser = userService.getCurrentUser();
+		checkState(currentUser != null, "Current user must be non null");
+		country.setCreatedBy(currentUser);
+		country.setUpdatedBy(currentUser);
+		
 		return countryDao.save(country);
 	}
 

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

@@ -28,6 +28,10 @@
 import org.slf4j.LoggerFactory;
 
 import org.springframework.security.authentication.encoding.PasswordEncoder;
+import org.springframework.security.core.Authentication;
+import org.springframework.security.core.context.SecurityContext;
+import org.springframework.security.core.context.SecurityContextHolder;
+
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -39,6 +43,7 @@
 import ru.mystamps.web.entity.UsersActivation;
 import ru.mystamps.web.dao.UserDao;
 import ru.mystamps.web.dao.UsersActivationDao;
+import ru.mystamps.web.support.spring.security.CustomUserDetails;
 
 @Service
 public class UserService {
@@ -133,6 +138,30 @@ public User findByLogin(final String login) {
 		return users.findByLogin(login);
 	}
 
+	User getCurrentUser() {
+		final SecurityContext ctx = SecurityContextHolder.getContext();
+		checkState(ctx != null, "Security context must be non null");
+		
+		final Authentication auth = ctx.getAuthentication();
+		if (auth == null) {
+			return null;
+		}
+		
+		final Object principal = auth.getPrincipal();
+		if (principal == null) {
+			return null;
+		}
+		
+		checkState(
+			principal instanceof CustomUserDetails,
+			"Principal must be CustomUserDetails type"
+		);
+		
+		final CustomUserDetails userDetails = (CustomUserDetails)principal;
+		
+		return userDetails.getUser();
+	}
+	
 	/**
 	 * Generates activation key.
 	 * @return string which contains numbers and letters in lower case

src/main/java/ru/mystamps/web/support/spring/security/CustomUserDetails.java

@@ -50,4 +50,9 @@ public String getSalt() {
 		return user.getSalt();
 	}
 
+	// used by UserService.getCurrentUser()
+	public User getUser() {
+		return user;
+	}
+	
 }

src/test/java/ru/mystamps/web/service/CountryServiceTest.java

@@ -42,6 +42,7 @@
 
 import ru.mystamps.web.dao.CountryDao;
 import ru.mystamps.web.entity.Country;
+import ru.mystamps.web.entity.User;
 import ru.mystamps.web.tests.fest.DateAssert;
 
 public class CountryServiceTest {
@@ -52,6 +53,9 @@ public class CountryServiceTest {
 	@Mock
 	private CountryDao countryDao;
 
+	@Mock
+	private UserService userService;
+	
 	@Captor
 	private ArgumentCaptor<Country> countryCaptor;
 
@@ -61,6 +65,7 @@ public class CountryServiceTest {
 	@BeforeMethod
 	public void setUp() {
 		MockitoAnnotations.initMocks(this);
+		when(userService.getCurrentUser()).thenReturn(UserServiceTest.getValidUser());
 	}
 
 	//
@@ -109,6 +114,35 @@ public void addShouldAssignUpdatedAtToCurrentDate() {
 		DateAssert.assertThat(countryCaptor.getValue().getUpdatedAt()).isCurrentDate();
 	}
 
+	@Test(expectedExceptions = IllegalStateException.class)
+	public void addShouldThrowExceptionWhenCannotDetermineCurrentUser() {
+		when(userService.getCurrentUser()).thenReturn(null);
+		
+		service.add(TEST_COUNTRY_NAME);
+	}
+	
+	@Test
+	public void addShouldAssignCreatedAtToCurrentUser() {
+		final User expectedUser = UserServiceTest.getValidUser();
+		when(userService.getCurrentUser()).thenReturn(expectedUser);
+		
+		service.add(TEST_COUNTRY_NAME);
+		
+		verify(countryDao).save(countryCaptor.capture());
+		assertThat(countryCaptor.getValue().getCreatedBy()).isEqualTo(expectedUser);
+	}
+	
+	@Test
+	public void addShouldAssignUpdatedAtToCurrentUser() {
+		final User expectedUser = UserServiceTest.getValidUser();
+		when(userService.getCurrentUser()).thenReturn(expectedUser);
+		
+		service.add(TEST_COUNTRY_NAME);
+		
+		verify(countryDao).save(countryCaptor.capture());
+		assertThat(countryCaptor.getValue().getUpdatedBy()).isEqualTo(expectedUser);
+	}
+	
 	//
 	// Tests for findAll()
 	//