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

         @Test
         @Transactional
         @Rollback(true)
         //@Rollback(true)
         public void importAlternativeFundingBids(){
             String path = "/home/panagiotis/Desktop/uploadFiles/";
-...
                         System.out.println("Organization " + organization +  "  not exists!");
                         //org = organizationManager.createOrganization(organization);
+                    }
     //                Organization org = (Organization) organizationManager.search(organization).get(0);
                     Organization org = (Organization) organizationManager.search(organization).get(0);
                     bid = this.initializeBid(funding_name,id,totalAmount,contractStartDate,contractEndDate);
                     bid.setFirstInvoice(this.uploadInvoiceFile(path,funding_name,FIRST_INVOICE_PDF));
                     bid.setSecondInvoice(this.uploadInvoiceFile(path,funding_name,SECOND_INVOICE_PDF));
-...
                 contractFile.setFile(baos.toByteArray());
             } catch (IOException e) {
                 e.printStackTrace();
+            }
-...
                 bankTransferReceipt = new BankTransferReceipt();
                 bankTransferReceipt.setContent(baos.toByteArray());
                 bankTransferReceipt.setContentType(contentType);
                 //TODO add date etc
             } catch (IOException e) {
                 e.printStackTrace();
-...
+            }
             return invoice;
+        }
+    }

     <?xml version="1.0" encoding="UTF-8"?>
     <beans xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
            xmlns:tx="http://www.springframework.org/schema/tx"
            xmlns="http://www.springframework.org/schema/beans"
            xmlns:context="http://www.springframework.org/schema/context"
            xmlns:aop="http://www.springframework.org/schema/aop"
     	   xmlns:tx="http://www.springframework.org/schema/tx"
     	   xmlns="http://www.springframework.org/schema/beans"
     	   xmlns:context="http://www.springframework.org/schema/context"
     	   xmlns:aop="http://www.springframework.org/schema/aop"
            xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.0.xsd
     	   xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.0.xsd
             http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-4.0.xsd
             http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.0.xsd
             http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-4.0.xsd">
      	<!-- Database Configuration -->
     	<!-- Database Configuration -->
     	<import resource="hibernate-cfg.xml"/>
     	<import resource="dataSource.xml"/>
     	<aop:aspectj-autoproxy proxy-target-class="true" />
     	<tx:annotation-driven transaction-manager="txManager"/>
         <bean id="txManager" class="org.springframework.orm.hibernate4.HibernateTransactionManager">
     	<bean id="txManager" class="org.springframework.orm.hibernate4.HibernateTransactionManager">
     		<property name="sessionFactory" ref="sessionFactory"/>
     	</bean>
     	<bean id="executorService" class="java.util.concurrent.Executors" factory-method="newCachedThreadPool" destroy-method="shutdown" />
     	<context:property-placeholder location="classpath*:/eu/**/applicationContext-goldoa-service.properties" />
     	<context:component-scan base-package="eu.dnetlib.goldoa.*" />
     	<context:annotation-config/>
     	<context:property-placeholder location="classpath:applicationContext-goldoa-service.properties" />
     	<context:component-scan base-package="eu.dnetlib.goldoa.service" />
     	<context:component-scan base-package="eu.dnetlib.goldoa.service.utils" />
     	<context:component-scan base-package="eu.dnetlib.goldoa.service.dao" />
     	<context:component-scan base-package="eu.dnetlib.goldoa.domain" />
     </beans>
     </beans>

     <?xml version="1.0" encoding="UTF-8"?>
     <!DOCTYPE hibernate-configuration PUBLIC
             "-//Hibernate/Hibernate Configuration DTD 3.0//EN"
             "http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd">
     		"-//Hibernate/Hibernate Configuration DTD 3.0//EN"
     		"http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd">
     <hibernate-configuration>
         <session-factory>
     	<session-factory>
     		<property name="hibernate.hbm2ddl.auto">update</property>
     		<property name="hibernate.dialect">org.hibernate.dialect.PostgreSQL9Dialect</property>
     		<property name="show_sql">false</property>
     		<property name="connection.pool_size">1</property>
     		<property name="format_sql">true</property>
     		<!--<property name="format_sql">true</property>-->
     		<!-- enable second level cache and query cache -->
     		<!--	<property name="hibernate.cache.use_second_level_cache">true</property>
                 <property name="hibernate.cache.region.factory_class">org.hibernate.cache.jcache.JCacheRegionFactory</property>
                 <property name="hibernate.javax.cache.provider">org.ehcache.jsr107.EhcacheCachingProvider</property>
                 <property name="hibernate.cache.use_query_cache">true</property>-->
     		<mapping class = "eu.dnetlib.goldoa.domain.User"/>
-...
     		<mapping class = "eu.dnetlib.goldoa.domain.UserRolePK"/>
     		<mapping class = "eu.dnetlib.goldoa.domain.Organization"/>
     		<mapping class = "eu.dnetlib.goldoa.domain.Affiliation"/>
     		<mapping class = "eu.dnetlib.goldoa.domain.Country"/>
     		<mapping class = "eu.dnetlib.goldoa.domain.File"/>
     		<mapping class = "eu.dnetlib.goldoa.domain.Funder"/>
-...
     		<mapping class = "eu.dnetlib.goldoa.domain.BankAccount"/>
     		<mapping class = "eu.dnetlib.goldoa.domain.BankTransferReceipt"/>
     		<mapping class = "eu.dnetlib.goldoa.domain.BudgetContract"/>
         </session-factory>
     </hibernate-configuration>
     		<mapping class = "eu.dnetlib.goldoa.domain.AlternativeFundingBid"/>
     	</session-factory>
     </hibernate-configuration>

     			String identifierValue = !line[8].equals("")?line[8].trim():null;
     			String apc = !line[9].equals("")?line[9].trim():"0";
     			String apcCurrency = !line[10].equals("")?line[10].trim():null;
     			String discount = line.length>11?line[11].trim():"0";
     			String discount = !line[11].equals("")?line[11].trim():null;
     			String status = line.length>12?line[12].trim():"0";
     			LOGGER.debug(discount + "/" + status);
     			importRequestFromCSV(firstname,lastname,organization,email,
     					grant,doi,acceptanceDate, identifierType,
     					identifierValue,apc, apcCurrency,discount);
     					identifierValue,apc, apcCurrency,discount,status);
+    		}
+    	}
-...
     	private void importRequestFromCSV(String firstname, String lastname, String organization, String email, String grant,
     									  String doi, String acceptanceDate,
     									  String identifierType, String identifierValue,
     									  String apc, String apcCurrency, String discount)
     									  String apc, String apcCurrency, String discount, String status)
     			throws PersonManagerException, ParseException, ManagerException, OrganizationManagerException {
     		List<Object> orgs =  organizationManager.search(organization);
-...
     		Request request = requestDAO.getRequestFromCSV(user,project,publication,org,
     				acceptanceDate, identifierType,identifierValue,apc, apcCurrency,discount);
     				acceptanceDate, identifierType,identifierValue,apc, apcCurrency,discount,status);
     		request.setId("L" + new SimpleDateFormat("yyyyMMdd-").format(new Date()) + requestDAO.getRequestId());
     		request.setEligibility(Eligibility.OK);

     	public Request getRequestFromCSV(User user, Project project, Publication publication, Organization organization,
     									 String acceptanceDate, String identifierType, String identifierValue,
     									 String apc, String apcCurrency, String discount) throws ParseException {
     									 String apc, String apcCurrency, String discount, String status) throws ParseException {
     		Request request = new Request();
     		request.setProject(project);
-...
     		publication.getIdentifiers().add(id);
     		request.setOrganization(organization);
     		request.setApc(apc!=null?Float.parseFloat(apc):null);
     		float APC  = Float.parseFloat(apc);
     		request.setApc(APC);
     		request.setApcPaid(APC);
     		if(discount != null){
     			float disc = Float.parseFloat(discount);
     			float fundingRequested = APC - (disc*APC / 100);
     			request.setProjectparticipation(100-disc);
     			request.setDiscount(disc);
     			request.setFundingrequested(fundingRequested);
     		}else {
     			request.setDiscount((float) 0);
     			request.setFundingrequested(APC);
     			request.setProjectparticipation((float) 100);
+    		}
     		request.setCurrency(apcCurrency!=null?Currency.valueOf(apcCurrency):null);
     		request.setDiscount(discount!=null?Float.parseFloat(discount):null);
     		request.setPublication(publication);
     		request.setStatus(Request.RequestStatus.LIBRARY_FUND_PAID);
     		request.setStatus(Request.RequestStatus.forStatus(Integer.parseInt(status)));
     		return request;
+    	}
+    }

     			List<Quadruple<String, Integer, Float, Float>> l = new ArrayList<>();
     			for(Object[] rs : resultSet){
     				if(rs[0] == null) rs[0] = "";
     				if(rs[2] == null) rs[2] = "0.0";
     				if(rs[3] == null) rs[3] = "0.0";
     				//if(rs[2] == null) rs[2] = "0.0";
     //				if(rs[3] == null) rs[3] = "0.0";
     				if(category != Series.Category.STATUS)
     					q = new Quadruple<>(rs[0].toString(),
     							Integer.parseInt(rs[1].toString()), Float.parseFloat(rs[2].toString()), Float.parseFloat(rs[3].toString()));
     				else
     					q = new Quadruple<>(Request.RequestStatus.forStatus((Integer) rs[0]).getValue(),
     							Integer.parseInt(rs[1].toString()), Float.parseFloat(rs[2].toString()), Float.parseFloat(rs[3].toString()));
     				l.add(q);
     				if(rs[2] != null && rs[3] != null){
     					if(category != Series.Category.STATUS)
     						q = new Quadruple<>(rs[0].toString(),
     								Integer.parseInt(rs[1].toString()), Float.parseFloat(rs[2].toString()), Float.parseFloat(rs[3].toString()));
     					else
     						q = new Quadruple<>(Request.RequestStatus.forStatus((Integer) rs[0]).getValue(),
     								Integer.parseInt(rs[1].toString()), Float.parseFloat(rs[2].toString()), Float.parseFloat(rs[3].toString()));
     					l.add(q);
+    				}
+    			}
     			map.put(category,l);
+    		}
-...
     		sb.append(" order by ").append(dateColumn);
     //		System.out.println(sb.toString());return null;
     		List<Object[]> resultSet = sessionFactory.getCurrentSession().createSQLQuery(sb.toString()).list();
     		List<Triple<Date, Integer, Float>> l = new ArrayList<>();
-...
     		SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.s");
     		for(Object[] rs : resultSet){
     			Date date = null;
     			try {
     				if(rs[0] == null)
     					date = null;
     				else
     					date = formatter.parse(rs[0].toString());
     				if(rs[2] == null)
     					rs[2] = "0.0";
     				Triple<Date, Integer, Float> t = new Triple<Date,Integer, Float>(date,
     						Integer.parseInt(rs[1].toString()),Float.parseFloat(rs[2].toString()));
     				l.add(t);
     				if(rs[2] != null){
     					//rs[2] = "0.0";
     					Triple<Date, Integer, Float> t = new Triple<Date,Integer, Float>(date,
     							Integer.parseInt(rs[1].toString()),Float.parseFloat(rs[2].toString()));
     					l.add(t);
+    				}
     			} catch (ParseException e) {
     				e.printStackTrace();
+    			}

Project

General

Profile

D-Net

Revision 50141

Added by Panagiotis Kanakakis almost 7 years ago