/ - Diff - D-Net - D-Net project tracking tool

     package eu.dnetlib.goldoa.domain;
     import com.fasterxml.jackson.annotation.JsonBackReference;
     import java.io.Serializable;
     import javax.persistence.*;
     /**
      * The persistent class for the request_comment database table.
+     *
      */
     @Entity
     @Table(name="request_comment")
     public class RequestComment implements Serializable {
     	private static final long serialVersionUID = 1L;
     	@Id
     	@ManyToOne
         @JoinColumn(name = "comment")
     	private Comment comment;
     	@Id
     	@ManyToOne
     	@JoinColumn(name = "\"user\"")
     	@JsonBackReference
     	private User user;
     	@Id
     	@ManyToOne
         @JoinColumn(name = "request")
     	private Request request;
     	public RequestComment() {
+    	}
     	public Comment getComment() {
     		return this.comment;
+    	}
     	public void setComment(Comment comment) {
     		this.comment = comment;
+    	}
     	public User getUser() {
     		return user;
+    	}
     	public void setUser(User user) {
     		this.user = user;
+    	}
     	public Request getRequest() {
     		return request;
+    	}
     	public void setRequest(Request request) {
     		this.request = request;
+    	}
     	@Override
     	public boolean equals(Object o) {
     		if (this == o) return true;
     		if (o == null || getClass() != o.getClass()) return false;
     		RequestComment that = (RequestComment) o;
     		if (comment != null ? !comment.equals(that.comment) : that.comment != null) return false;
     		if (user != null ? !user.equals(that.user) : that.user != null) return false;
     		return request != null ? request.equals(that.request) : that.request == null;
+    	}
     	@Override
     	public int hashCode() {
     		int result = comment != null ? comment.hashCode() : 0;
     		result = 31 * result + (user != null ? user.hashCode() : 0);
     		result = 31 * result + (request != null ? request.hashCode() : 0);
     		return result;
+    	}
+    }

modules/uoa-goldoa-service/branches/hibernate/src/test/java/unitest/BudgetTest.java
43	43	budget.setUser(um.getByEmail("pkanakakis@di.uoa.gr"));
44	44	budget.setBankAccount(bankAccount);
45	45	budget.setAmountRequested(Float.parseFloat("10000"));
46		budget.setOrganization(om.getById("corda::983580389"));
47	46	budget.getOrganizations().add(om.getById("corda::983580389"));
48	47	bg.submitBudgetRequest(budget);
49	48	}

modules/uoa-goldoa-service/branches/hibernate/src/test/resources/applicationContext-goldoa-service.properties
1	1	goldoa.db.driverClassName = org.postgresql.Driver
2		goldoa.db.url = jdbc:postgresql://194.177.192.119:5432/goldoa-test-1
	2	goldoa.db.url = jdbc:postgresql://194.177.192.119:5432/goldoamigration
3	3	goldoa.db.username = dnet
4	4	goldoa.db.password = dnetPwd
5	5

     import eu.dnetlib.goldoa.domain.*;
     import eu.dnetlib.goldoa.service.dao.RequestDAO;
     import eu.dnetlib.goldoa.service.utils.EmailUtils;
     import net.sf.ehcache.search.expression.Or;
     import org.springframework.beans.factory.annotation.Autowired;
     import org.springframework.dao.EmptyResultDataAccessException;
     import org.springframework.stereotype.Service;
-...
     		if (request.getBudget() != null) {
                 Budget budget = request.getBudget();
     			if (budget.getOrganization() != null)
                 //Organization organization = budgetManager.getBudgetForOrganization(budget.getId());
     			Organization organization = budget.getOrganizations().get(0);
     			if (organization != null)
     				request.setStatus(Request.RequestStatus.LIBRARY_FUND_SUBMITTED);
     			else if (budget.getPublisher() != null)
     				request.setStatus(Request.RequestStatus.PUBLISHER_FUND_SUBMITTED);

     package eu.dnetlib.goldoa.service;
     import eu.dnetlib.goldoa.domain.Budget;
     import eu.dnetlib.goldoa.domain.Organization;
     import java.io.InputStream;
     import java.util.List;
-...
     	public void uploadBankReceipt(String budgetId, String contentType, InputStream inputStream);
     	public Budget getForRequest(String organizationId, String publisherEmail);
         public Organization getOrganizationForBudget(String id);
+    }

     import eu.dnetlib.goldoa.domain.Currency;
     import eu.dnetlib.goldoa.domain.Publisher;
     import eu.dnetlib.goldoa.domain.Vocabulary;
     import eu.dnetlib.goldoa.service.dao.UserDAO;
     import eu.dnetlib.goldoa.service.dao.PublisherDAO;
     import org.apache.commons.codec.digest.DigestUtils;
-...
     		this.publisherDAO = publisherDAO;
+    	}
     	public Integer getBankAddress() {
     		return publisherDAO.getBankAddress();
+    	}
+    }

     package eu.dnetlib.goldoa.service.dao;
     import eu.dnetlib.goldoa.domain.Publisher;
     import eu.dnetlib.goldoa.domain.Vocabulary;
     import org.hibernate.criterion.Restrictions;
     import org.springframework.stereotype.Repository;
     import java.util.ArrayList;
     import java.util.List;
     /**
-...
     		return publisher;
+    	}
         public Integer getBankAddress() {
     		return getSession().createQuery("select nextval('publisher_bank_address_seq') as id").getFirstResult();
+        }
+    }

+    	}
     	public List<Comment> getComments(String id) {
     		Request r = getRequest(id);
     		List<Comment> cms = null;
     		for(RequestComment rc : r.getRequestComments())
     			cms.add(rc.getComment());
     		return cms;
     		return getRequest(id).getRequestComments();
+    	}
     	public void uploadBankTransferReceipt(final String requestid, final String contentType, InputStream inputStream) {

modules/uoa-goldoa-service/branches/hibernate/src/main/java/eu/dnetlib/goldoa/service/dao/BudgetDAO.java
49	49	.addOrder(Order.asc("date")).list();
50	50	}
51	51
	52	@SuppressWarnings("unchecked")
52	53	public List<Budget> getBudgetsForOrganization(final List<String> organizationIds) {
53	54	List<Budget> rs = new ArrayList<>();
54	55	for(String orgID : organizationIds){
...	...
236	237	public BigInteger getRequestId() {
237	238	return (BigInteger) getSession().createSQLQuery("select nextval('budget_id_seq') as id").list().get(0);
238	239	}
	240
	241	public Organization getOrganizationForBudget(String budgetID) {
	242	return (Organization) createEntityCriteria().add(Restrictions.eq("budget.id", budgetID)).list().get(0);
	243	}
239	244	}

     		Publisher publisher = new Publisher();
     		publisher.setName(publisherName.textValue());
     		/*publisher.setBank_address(publisherManager.getBankAddress().toString());
     		publisher.setBank_holder(null);
     		publisher.setBank_iban(null);
     		publisher.setBank_name(null);*/
     		publisher.setBankAccount(new BankAccount());
     		publisher.setId("crossref::" + DigestUtils.md5Hex(publisher.getName()));

modules/uoa-goldoa-service/branches/hibernate/src/main/java/eu/dnetlib/goldoa/service/PublisherManager.java
10	10	public Publisher getPublisher(String publisherId);
11	11
12	12	public Publisher savePublisher(Publisher publisher);
	13
	14	public Integer getBankAddress();
13	15	}

     package eu.dnetlib.goldoa.service;
     import eu.dnetlib.goldoa.domain.Budget;
     import eu.dnetlib.goldoa.domain.Organization;
     import eu.dnetlib.goldoa.domain.User;
     import eu.dnetlib.goldoa.domain.PersonManagerException;
     import eu.dnetlib.goldoa.service.dao.BudgetDAO;
-...
     	private Budget.Status getStatus(int statusCode) {
     		return Budget.Status.forStatus(statusCode);
+    	}
     	public Organization getOrganizationForBudget(String budgetID){
     		return budgetDAO.getOrganizationForBudget(budgetID);
+    	}
+    }

     package eu.dnetlib.goldoa.domain;
     import com.fasterxml.jackson.annotation.JsonBackReference;
     import java.io.Serializable;
     import javax.persistence.*;
     import java.sql.Time;
-...
     	@ManyToMany(fetch = FetchType.LAZY, mappedBy = "comments")
     	private List<Budget> budgets = new ArrayList<>();
     	@ManyToMany(fetch = FetchType.LAZY, mappedBy = "requestComments")
     	@JsonBackReference
     	private List<Request> requests = new ArrayList<>();
     	@OneToMany(mappedBy = "comment",cascade=CascadeType.ALL)
     	private List<RequestComment> requestComment = new ArrayList<>();
     	public Comment() {
+    	}

     	@JsonBackReference
     	private List<Project> projects = new ArrayList<>();
     	@ManyToMany(fetch = FetchType.LAZY, mappedBy = "organizations")
     	@JsonBackReference
     	private List<Project> publishers = new ArrayList<>();
     	@OneToMany(fetch = FetchType.LAZY, mappedBy = "pk.organization")
     	private List<PublisherDiscount> publisherDiscount = new ArrayList<>();
-...
     	public void setProjects(List<Project> projects) {
     		this.projects = projects;
+    	}
     	public List<Project> getPublishers() {
     		return publishers;
+    	}
     	public void setPublishers(List<Project> publishers) {
     		this.publishers = publishers;
+    	}
+    }

     	@Column(columnDefinition = "text")
     	private String languages;
     	@OneToOne
         @JoinColumn(name = "country")
     	private Country country;
     	@Column(columnDefinition = "text")
     	private String country;
     	@Basic
     	@Convert( converter=CurrencyConverter.class )
-...
     		this.apccurrency = apccurrency;
+    	}
     	public Country getCountry() {
     	public String getCountry() {
     		return this.country;
+    	}
     	public void setCountry(Country country) {
     	public void setCountry(String country) {
     		this.country = country;
+    	}

     			inverseJoinColumns = {@JoinColumn(name = "project",
     					nullable = false, updatable = false) })
     	private List<Project> coordinatedProjects = new ArrayList<>();
     	@OneToMany(mappedBy = "user",cascade=CascadeType.ALL)
     	private List<RequestComment> requestComment = new ArrayList<>();
     	public List<UserRole> getRoles() {
     		return roles;
-...
     		this.coordinatedProjects = coordinatedProjects;
+    	}
     	public List<RequestComment> getRequestComment() {
     		return requestComment;
+    	}
     	public void setRequestComment(List<RequestComment> requestComment) {
     		this.requestComment = requestComment;
+    	}
+    }

     	@Column(columnDefinition = "text")
     	private String source;
     	/*@Column(columnDefinition = "text")
     	private String bank_name;
     	@Column(columnDefinition = "text")
     	private String bank_address;
     	@Column(columnDefinition = "text")
     	private String bank_iban;
     	@Column(columnDefinition = "text")
     	private String bank_holder;*/
     	@OneToOne
     	@JoinColumn(name = "bankAccount")
     	private BankAccount bankAccount;
-...
     	@JsonBackReference(value="contact")
     	private User contact;
     	@ManyToMany(fetch = FetchType.LAZY, cascade = CascadeType.ALL)
     	@JoinTable(name = "organization_publisher",  joinColumns = {
     			@JoinColumn(name = "publisher", nullable = false, updatable = false)},
     			inverseJoinColumns = { @JoinColumn(name = "organization",
     					nullable = false, updatable = false) })
     	private List<Organization> organizations = new ArrayList<>();
     	public Publisher() {}
     	/*public String getBank_name() {
     		return bank_name;
+    	}
     	public void setBank_name(String bank_name) {
     		this.bank_name = bank_name;
+    	}
     	public String getBank_address() {
     		return bank_address;
+    	}
     	public void setBank_address(String bank_address) {
     		this.bank_address = bank_address;
+    	}
     	public String getBank_iban() {
     		return bank_iban;
+    	}
     	public void setBank_iban(String bank_iban) {
     		this.bank_iban = bank_iban;
+    	}
     	public String getBank_holder() {
     		return bank_holder;
+    	}
     	public void setBank_holder(String bank_holder) {
     		this.bank_holder = bank_holder;
+    	}
     */
     	public float getApc() {
     		return this.apc;
+    	}
-...
     	public void setPublisherDiscount(List<PublisherDiscount> publisherDiscount) {
     		this.publisherDiscount = publisherDiscount;
+    	}
     	public List<Organization> getOrganizations() {
     		return organizations;
+    	}
     	public void setOrganizations(List<Organization> organizations) {
     		this.organizations = organizations;
+    	}
+    }

         @JoinColumn(name = "invoice")
     	private Invoice invoice;
     	@OneToOne
         @JoinColumn(name = "organization")
     	private Organization organization;
     	@OneToOne
         @JoinColumn(name = "publisher")
-...
     			inverseJoinColumns = { @JoinColumn(name = "budget",
     					nullable = false, updatable = false) })
     	private List<Organization> organizations = new ArrayList<>();
     	public Budget() {}
     	public User getUser() {
-...
     		this.invoice = invoice;
+    	}
     	public Organization getOrganization() {
     		return this.organization;
+    	}
     	public void setOrganization(Organization organization) {
     		this.organization = organization;
+    	}
     	public Float getOtherCost() {
     		return this.otherCost;
+    	}

     	@OneToMany(mappedBy = "pk.request",cascade=CascadeType.ALL)
     	private List<RequestCoFunder> requestCoFunders = new ArrayList<>();
     	@OneToMany(mappedBy = "request",cascade=CascadeType.ALL)
     	private List<RequestComment> requestComments = new ArrayList<>();
     	@ManyToMany(fetch = FetchType.LAZY, cascade = CascadeType.ALL)
     	@JoinTable(name = "request_comment",  joinColumns = {
     			@JoinColumn(name = "request", nullable = false, updatable = false)},
     			inverseJoinColumns = { @JoinColumn(name = "comment",
     					nullable = false, updatable = false) })
     	private List<Comment> requestComments = new ArrayList<>();
     	public Request() {}
-...
     		this.requestCoFunders = requestCoFunders;
+    	}
     	public List<RequestComment> getRequestComments() {
     	public List<Comment> getRequestComments() {
     		return requestComments;
+    	}
     	public void setRequestComments(List<RequestComment> requestComments) {
     	public void setRequestComments(List<Comment> requestComments) {
     		this.requestComments = requestComments;
+    	}

modules/uoa-goldoa-service/branches/hibernate/src/main/resources/eu/dnetlib/goldoa/service/applicationContext-goldoa-service.properties
1	1	goldoa.db.driverClassName = org.postgresql.Driver
2	2
3		goldoa.db.url = jdbc:postgresql://194.177.192.119:5432/goldoa-test-1
	3	goldoa.db.url = jdbc:postgresql://194.177.192.119:5432/goldoamigration
4	4	goldoa.db.username = dnet
5	5	goldoa.db.password = dnetPwd
6	6

     <hibernate-configuration>
         <session-factory>
             <property name="hibernate.hbm2ddl.auto">validate</property>
             <property name="hibernate.hbm2ddl.auto">update</property>
     		<property name="hibernate.dialect">org.hibernate.dialect.PostgreSQL9Dialect</property>
             <property name="show_sql">true</property>
            	<property name="connection.pool_size">1</property>

Project

General

Profile

D-Net

Revision 46633

Added by Panagiotis Kanakakis over 7 years ago