From eaf9b0091315c822f5d096f70a8d017e15f35e5f Mon Sep 17 00:00:00 2001
From: Mirco Nasuti <mirco.nasuti@chuv.ch>
Date: Thu, 3 Mar 2016 09:53:29 +0100
Subject: [PATCH] use contractor and subproject field to fill User.team field
---
src/main/java/org/hbp/mip/MIPApplication.java | 1 -
src/main/java/org/hbp/mip/model/User.java | 12 ++++++++++++
2 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/src/main/java/org/hbp/mip/MIPApplication.java b/src/main/java/org/hbp/mip/MIPApplication.java
index 35671d076..5c2e951fa 100644
--- a/src/main/java/org/hbp/mip/MIPApplication.java
+++ b/src/main/java/org/hbp/mip/MIPApplication.java
@@ -133,7 +133,6 @@ public static void main(String[] args) {
.uniqueResult();
if (user == null) {
user = new User(getUserInfos());
- user.setTeam("CHUV");
session.save(user);
}
session.getTransaction().commit();
diff --git a/src/main/java/org/hbp/mip/model/User.java b/src/main/java/org/hbp/mip/model/User.java
index 4334afea9..e2f549d04 100644
--- a/src/main/java/org/hbp/mip/model/User.java
+++ b/src/main/java/org/hbp/mip/model/User.java
@@ -90,6 +90,18 @@ public class User {
}
}
+ p = Pattern.compile("contractor=([\\w ]+)");
+ m = p.matcher(userInfo);
+ if (m.find()) {
+ this.team = m.group(1);
+ }
+
+ p = Pattern.compile("subprojects=([A-Za-z0-9\\[\\] ]+)");
+ m = p.matcher(userInfo);
+ if (m.find()) {
+ this.team += m.group(1);
+ }
+
if (this.picture == null || this.picture.isEmpty()) {
this.picture = "images/users/default_user.png";
}
--
GitLab