From 968a911ccf86d2bfdd2db61c10602695e3cd5f17 Mon Sep 17 00:00:00 2001
From: Athou <jeremiepanzer@gmail.com>
Date: Sun, 16 Jun 2013 18:31:21 +0200
Subject: [PATCH] save when users were created

---
 src/main/java/com/commafeed/backend/model/User.java | 13 ++++++++++++-
 .../com/commafeed/backend/services/UserService.java |  1 +
 src/main/resources/changelogs/db.changelog-1.1.xml  |  7 +++++++
 3 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/commafeed/backend/model/User.java b/src/main/java/com/commafeed/backend/model/User.java
index 5be4e350..cf0e203d 100644
--- a/src/main/java/com/commafeed/backend/model/User.java
+++ b/src/main/java/com/commafeed/backend/model/User.java
@@ -41,6 +41,9 @@ public class User extends AbstractModel {
 	@Temporal(TemporalType.TIMESTAMP)
 	private Date lastLogin;
 
+	@Temporal(TemporalType.TIMESTAMP)
+	private Date created;
+
 	@Column(length = 40)
 	private String recoverPasswordToken;
 
@@ -51,7 +54,7 @@ public class User extends AbstractModel {
 			CascadeType.REMOVE })
 	private Set<UserRole> roles = Sets.newHashSet();
 
-	@ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.REMOVE)
+	@OneToMany(mappedBy = "user", fetch = FetchType.LAZY, cascade = CascadeType.REMOVE)
 	private Set<FeedSubscription> subscriptions;
 
 	public String getName() {
@@ -142,4 +145,12 @@ public class User extends AbstractModel {
 		this.subscriptions = subscriptions;
 	}
 
+	public Date getCreated() {
+		return created;
+	}
+
+	public void setCreated(Date created) {
+		this.created = created;
+	}
+
 }
diff --git a/src/main/java/com/commafeed/backend/services/UserService.java b/src/main/java/com/commafeed/backend/services/UserService.java
index 21e1b1a1..079e9bc2 100644
--- a/src/main/java/com/commafeed/backend/services/UserService.java
+++ b/src/main/java/com/commafeed/backend/services/UserService.java
@@ -71,6 +71,7 @@ public class UserService {
 		byte[] salt = encryptionService.generateSalt();
 		user.setName(name);
 		user.setEmail(email);
+		user.setCreated(Calendar.getInstance().getTime());
 		user.setSalt(salt);
 		user.setPassword(encryptionService.getEncryptedPassword(password, salt));
 		for (Role role : roles) {
diff --git a/src/main/resources/changelogs/db.changelog-1.1.xml b/src/main/resources/changelogs/db.changelog-1.1.xml
index bcee680d..bbbc87ed 100644
--- a/src/main/resources/changelogs/db.changelog-1.1.xml
+++ b/src/main/resources/changelogs/db.changelog-1.1.xml
@@ -215,6 +215,13 @@
 	
 	<changeSet author="athou" id="norwegian-migration">
 		<sql>update USERSETTINGS set user_lang='nb' where user_lang='no'</sql>
+	</changeSet>
+	
+	<changeSet author="athou" id="add-user-created">
+		<addColumn tableName="USERS">
+		    <column name="created" type="DATETIME" />
+		</addColumn>
+		<sql>update USERS set created = lastLogin</sql>
 	</changeSet>		
 
 </databaseChangeLog>