Skip to content
Snippets Groups Projects
Commit cddfb033 authored by Mirco Nasuti's avatar Mirco Nasuti
Browse files

bugfix database + add user to articles

parent b2f0ee8e
No related branches found
No related tags found
No related merge requests found
Showing
with 45 additions and 15 deletions
...@@ -75,6 +75,24 @@ public class MIPApplication extends WebSecurityConfigurerAdapter { ...@@ -75,6 +75,24 @@ public class MIPApplication extends WebSecurityConfigurerAdapter {
return principal; return principal;
} }
private User principalToUser(Principal principal) {
Session session = HibernateUtil.getSessionFactory().getCurrentSession();
session.beginTransaction();
org.hibernate.Query query = session.createQuery("from User where username= :username");
query.setString("username", principal.getName());
User user = (User) query.uniqueResult();
session.getTransaction().commit();
if(user == null)
{
session = HibernateUtil.getSessionFactory().getCurrentSession();
session.beginTransaction();
user = new User(principal);
session.save(user);
session.getTransaction().commit();
}
return user;
}
@RequestMapping(value = "/articles", method = RequestMethod.GET) @RequestMapping(value = "/articles", method = RequestMethod.GET)
@ResponseBody @ResponseBody
public List<Article> getArticles() { public List<Article> getArticles() {
...@@ -133,13 +151,15 @@ public class MIPApplication extends WebSecurityConfigurerAdapter { ...@@ -133,13 +151,15 @@ public class MIPApplication extends WebSecurityConfigurerAdapter {
@RequestMapping(value = "/articles", method = RequestMethod.POST) @RequestMapping(value = "/articles", method = RequestMethod.POST)
@ResponseBody @ResponseBody
public Article postArticle(@RequestBody Article article) { public Article postArticle(@RequestBody Article article, Principal principal) {
User user = principalToUser(principal);
Session session = HibernateUtil.getSessionFactory().getCurrentSession(); Session session = HibernateUtil.getSessionFactory().getCurrentSession();
session.beginTransaction(); session.beginTransaction();
article.setCreatedAt(new Date()); article.setCreatedAt(new Date());
article.setPublishedAt(new Date()); article.setPublishedAt(new Date());
article.setSlug(article.getTitle().toLowerCase()); article.setSlug(article.getTitle().toLowerCase());
article.setStatus("published"); article.setStatus("published");
article.setCreatedBy(user);
session.save(article); session.save(article);
session.getTransaction().commit(); session.getTransaction().commit();
return article; return article;
......
...@@ -10,6 +10,7 @@ import java.util.LinkedList; ...@@ -10,6 +10,7 @@ import java.util.LinkedList;
import java.util.List; import java.util.List;
@Entity @Entity
@Table(name = "article_mip")
public class Article { public class Article {
@Id @Id
@GeneratedValue(strategy = GenerationType.IDENTITY) @GeneratedValue(strategy = GenerationType.IDENTITY)
......
...@@ -9,6 +9,7 @@ import java.util.LinkedList; ...@@ -9,6 +9,7 @@ import java.util.LinkedList;
import java.util.List; import java.util.List;
@Entity @Entity
@Table(name = "chart_mip")
public class Chart { public class Chart {
@Id @Id
@GeneratedValue(strategy = GenerationType.IDENTITY) @GeneratedValue(strategy = GenerationType.IDENTITY)
......
...@@ -4,12 +4,10 @@ ...@@ -4,12 +4,10 @@
package org.hbp.mip.model; package org.hbp.mip.model;
import javax.persistence.Entity; import javax.persistence.*;
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
@Entity @Entity
@Table(name = "chart_config_set_mip")
public class ChartConfigSet { public class ChartConfigSet {
@Id @Id
@GeneratedValue(strategy = GenerationType.IDENTITY) @GeneratedValue(strategy = GenerationType.IDENTITY)
......
...@@ -9,6 +9,7 @@ import java.util.Date; ...@@ -9,6 +9,7 @@ import java.util.Date;
import java.util.List; import java.util.List;
@Entity @Entity
@Table(name = "dataset_mip")
public class Dataset { public class Dataset {
@Id @Id
@GeneratedValue(strategy = GenerationType.IDENTITY) @GeneratedValue(strategy = GenerationType.IDENTITY)
......
...@@ -7,6 +7,7 @@ package org.hbp.mip.model; ...@@ -7,6 +7,7 @@ package org.hbp.mip.model;
import javax.persistence.*; import javax.persistence.*;
@Entity @Entity
@Table(name = "filter_mip")
public class Filter { public class Filter {
@Id @Id
@GeneratedValue(strategy = GenerationType.IDENTITY) @GeneratedValue(strategy = GenerationType.IDENTITY)
......
...@@ -9,6 +9,7 @@ import java.util.LinkedList; ...@@ -9,6 +9,7 @@ import java.util.LinkedList;
import java.util.List; import java.util.List;
@Entity @Entity
@Table(name = "group_mip")
public class Group { public class Group {
@Id @Id
@GeneratedValue(strategy = GenerationType.IDENTITY) @GeneratedValue(strategy = GenerationType.IDENTITY)
......
...@@ -8,6 +8,7 @@ import javax.persistence.*; ...@@ -8,6 +8,7 @@ import javax.persistence.*;
import java.util.Date; import java.util.Date;
@Entity @Entity
@Table(name = "model_mip")
public class Model { public class Model {
@Id @Id
@GeneratedValue(strategy = GenerationType.IDENTITY) @GeneratedValue(strategy = GenerationType.IDENTITY)
......
...@@ -9,6 +9,7 @@ import java.util.LinkedList; ...@@ -9,6 +9,7 @@ import java.util.LinkedList;
import java.util.List; import java.util.List;
@Entity @Entity
@Table(name = "query_mip")
public class Query { public class Query {
@Id @Id
@GeneratedValue(strategy = GenerationType.IDENTITY) @GeneratedValue(strategy = GenerationType.IDENTITY)
......
...@@ -4,12 +4,10 @@ ...@@ -4,12 +4,10 @@
package org.hbp.mip.model; package org.hbp.mip.model;
import javax.persistence.Entity; import javax.persistence.*;
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
@Entity @Entity
@Table(name = "tag_mip")
public class Tag { public class Tag {
@Id @Id
@GeneratedValue(strategy = GenerationType.IDENTITY) @GeneratedValue(strategy = GenerationType.IDENTITY)
......
...@@ -5,10 +5,12 @@ ...@@ -5,10 +5,12 @@
package org.hbp.mip.model; package org.hbp.mip.model;
import javax.persistence.*; import javax.persistence.*;
import java.security.Principal;
import java.util.LinkedList; import java.util.LinkedList;
import java.util.List; import java.util.List;
@Entity @Entity
@Table(name = "user_mip")
public class User { public class User {
@Id @Id
@GeneratedValue(strategy = GenerationType.IDENTITY) @GeneratedValue(strategy = GenerationType.IDENTITY)
...@@ -22,7 +24,7 @@ public class User { ...@@ -22,7 +24,7 @@ public class User {
private String phone; private String phone;
private String birthday; private String birthday;
private String gender; private String gender;
@ElementCollection @ElementCollection(fetch = FetchType.EAGER)
private List<String> languages; private List<String> languages;
private String city; private String city;
private String country; private String country;
...@@ -31,12 +33,18 @@ public class User { ...@@ -31,12 +33,18 @@ public class User {
private boolean isActive; private boolean isActive;
private String apikey; private String apikey;
private String team; private String team;
@ElementCollection @ElementCollection(fetch = FetchType.EAGER)
private List<String> roles; private List<String> roles;
public User() { public User() {
} }
public User(Principal principal)
{
this.username = principal.getName();
this.fullname = this.username;
}
public Long getId() { public Long getId() {
return id; return id;
} }
......
...@@ -4,12 +4,10 @@ ...@@ -4,12 +4,10 @@
package org.hbp.mip.model; package org.hbp.mip.model;
import javax.persistence.Entity; import javax.persistence.*;
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
@Entity @Entity
@Table(name = "value_mip")
public class Value { public class Value {
@Id @Id
@GeneratedValue(strategy = GenerationType.IDENTITY) @GeneratedValue(strategy = GenerationType.IDENTITY)
......
...@@ -9,6 +9,7 @@ import java.util.LinkedList; ...@@ -9,6 +9,7 @@ import java.util.LinkedList;
import java.util.List; import java.util.List;
@Entity @Entity
@Table(name = "variable_mip")
public class Variable { public class Variable {
@Id @Id
@GeneratedValue(strategy = GenerationType.IDENTITY) @GeneratedValue(strategy = GenerationType.IDENTITY)
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment