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

modules/uoa-goldoa-service/branches/hibernate/src/test/java/unitest/ProfileTest.java
183	183	}
184	184	}
185	185
	186	@Test
	187	@Transactional
	188	@Rollback(true)
	189	public void getPublisherContacts(){
	190	List<Object> rs = null;
	191
	192	rs = sm.search(SearchManager.TYPE.PUBLISHER,"EDP Sciences");
	193	Publisher pub = null;
	194	pub = (Publisher)rs.get(0);
	195
	196	for(User contact:pub.getContacts())
	197	System.out.println(contact.getEmail());
	198
	199	}
	200
186	201	}

             RequestPage rs = rm.getRequests(null, null, RequestSort.USER, RequestSortOrder.DESCENDING, null, null, null, 0, 9);
             List<Request> rss = rs.getRequests();
             for(Request r:rss)
             for(Request r:rss) {
                 System.out.println(r.getStatus() + "/" + r.getStatus().getValue());
                 System.out.println(r.getId());
+            }
+        }
         @Test
         @Transactional
         @Rollback(true)
         public void updateRequest() throws PersonManagerException {
             Request r = rm.getById("20170509-1495");
             Request r = rm.getById("20170512-1507");
             List<Object> res = sm.search(SearchManager.TYPE.FUNDER, "8020 Promotion Foundation");
             Funder f = (Funder)res.get(0);
-...
             rc.setPercentage(50);
             r.getRequestCoFunders().add(rc);
             r.setPublisher((Publisher)sm.search(SearchManager.TYPE.PUBLISHER, "EDP Sciences-2").get(0));
             r.setApcPaid((float) 10000);
             rm.saveRequest(r);

modules/uoa-goldoa-service/branches/hibernate/src/main/java/eu/dnetlib/goldoa/service/PublisherManagerImpl.java
80	80	return publisher;
81	81	}
82	82
	83	@Override
	84	public BigInteger getBankId() {
	85	return publisherDAO.getBankId();
	86	}
	87
83	88	}
84	89

     	public Publisher savePublisher(Publisher publisher) {
     		if(publisher.getBankAccount() == null)
     			publisher.setBankAccount(new BankAccount(null,getBankAddress().toString(),null,null,null));
     		if(publisher.getBankAccount() == null) {
     			BigInteger id = getBankId();
     			publisher.setBankAccount(new BankAccount(id,null, getBankAddress().toString(), null, null, null));
+    		}
     		Publisher p = getPublisher(publisher.getId());
     		Publisher publisher_merged = null;
-...
+        }
     	public BigInteger getBankId() {
     		return (BigInteger) getSession().createSQLQuery("select nextval('bank_id_seq') as id").list().get(0);
+    	}
         @SuppressWarnings("unchecked")
         public Publisher getPublisherByName(String name) {
     		List<Publisher> rs = (List<Publisher>) createEntityCriteria()

     import org.springframework.stereotype.Repository;
     import javax.persistence.Query;
     import java.math.BigInteger;
     import java.sql.Timestamp;
     import java.util.ArrayList;
     import java.util.List;
-...
             acc_action.setToken(token);
             acc_action.setDate(new Timestamp(System.currentTimeMillis()));
             acc_action.setExpires(new Timestamp(System.currentTimeMillis() + 1000L * 60L * 60L * 24L * tokenTTL));
             BigInteger id = (BigInteger) getSession().createSQLQuery("select nextval('account_action_seq') as id").list().get(0);
             acc_action.setId(id);
             getSession().persist(acc_action);
+        }

     import org.springframework.transaction.annotation.Transactional;
     import java.io.InputStream;
     import java.math.BigInteger;
     import java.net.URL;
     import java.util.ArrayList;
     import java.util.Calendar;
-...
     			publisher.setName(publisherName.textValue());
     			String value = publisherManager.getBankAddress().toString();
     			publisher.setBankAccount(new BankAccount(null,value,
     			BigInteger id = publisherManager.getBankId();
     			publisher.setBankAccount(new BankAccount(id,null,value,
     					null,null,null));
     			publisher.setId("crossref::" + DigestUtils.md5Hex(publisher.getName()));

modules/uoa-goldoa-service/branches/hibernate/src/main/java/eu/dnetlib/goldoa/service/PublisherManager.java
18	18	public Publisher getPublisherByName(String s);
19	19
20	20	public Publisher generateId(Publisher publisher);
	21
	22	public BigInteger getBankId();
21	23	}

     import java.io.Serializable;
     import javax.persistence.*;
     import java.math.BigInteger;
     import java.sql.Timestamp;
-...
     	private static final long serialVersionUID = 1L;
     	@Id
     	@GeneratedValue(strategy=GenerationType.AUTO)
     	@Column(columnDefinition = "text")
     	private int id;
     	private BigInteger id;
     	private Timestamp date;
-...
     		this.user = user;
+    	}
     	public int getId() {
     	public BigInteger getId() {
     		return id;
+    	}
     	public void setId(int id) {
     	public void setId(BigInteger id) {
     		this.id = id;
+    	}

     import com.google.gwt.user.client.rpc.IsSerializable;
     import javax.persistence.*;
     import java.math.BigInteger;
     /**
      * Created by antleb on 5/2/15.
-...
     	private static final long serialVersionUID = 1L;
     	@Id
     	@GeneratedValue(strategy= GenerationType.AUTO)
     	private Integer id;
     	private BigInteger id;
     	private String bankName;
     	private String bankAddress;
     	private String bankCode;
-...
     	public BankAccount() {
+    	}
     	public BankAccount(String bankName, String bankAddress, String bankCode, String accountHolder, String iban) {
     	public BankAccount(BigInteger id,String bankName, String bankAddress, String bankCode, String accountHolder, String iban) {
     		this.id = id;
     		this.bankName = bankName;
     		this.bankAddress = bankAddress;
     		this.bankCode = bankCode;
-...
     		this.iban = iban;
+    	}
     	public BigInteger getId() {
     		return id;
+    	}
     	public void setId(BigInteger id) {
     		this.id = id;
+    	}
+    }

D-Net