summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorBjörn Hagemeister2014-10-08 14:54:08 +0200
committerBjörn Hagemeister2014-10-08 14:54:08 +0200
commit6f69ddf1881d875d1d976ede5299b98a707dbe16 (patch)
tree7edc3de6728cd2c50ffdf785966a619b8a488727 /src
parentAdapted FielUploadWorker and ThriftConnection for using publishUser(..). (diff)
downloadsatellite-daemon-6f69ddf1881d875d1d976ede5299b98a707dbe16.tar.gz
satellite-daemon-6f69ddf1881d875d1d976ede5299b98a707dbe16.tar.xz
satellite-daemon-6f69ddf1881d875d1d976ede5299b98a707dbe16.zip
Added organizationId to DbUser.
Diffstat (limited to 'src')
-rw-r--r--src/main/java/org/openslx/satellitedaemon/db/DbUser.java6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/main/java/org/openslx/satellitedaemon/db/DbUser.java b/src/main/java/org/openslx/satellitedaemon/db/DbUser.java
index 133adf4..deebd66 100644
--- a/src/main/java/org/openslx/satellitedaemon/db/DbUser.java
+++ b/src/main/java/org/openslx/satellitedaemon/db/DbUser.java
@@ -7,12 +7,14 @@ public class DbUser
public final String firstName;
public final String lastName;
public final String email;
+ public final String institution;
- public DbUser(String userId, String firstName, String lastName, String email) {
+ public DbUser(String userId, String firstName, String lastName, String email, String institution) {
this.userId = userId;
this.firstName = firstName;
this.lastName = lastName;
this.email = email;
+ this.institution = institution;
}
/**
@@ -22,7 +24,7 @@ public class DbUser
*/
public static DbUser getUserById(String userId) {
return MySQL.findUniqueOrNull( DbUser.class, "SELECT user.userID, user.Vorname AS firstName, " +
- "user.Nachname AS lastName, user.mail AS email" +
+ "user.Nachname AS lastName, user.mail AS email, user.institution" +
"FROM m_user user" +
"WHERE userID = ?", userId );
}