Revision 48860
Added by Panagiotis Kanakakis over 6 years ago
modules/uoa-goldoa-service/branches/hibernate/src/main/java/eu/dnetlib/goldoa/service/RequestManagerImpl.java | ||
---|---|---|
70 | 70 |
|
71 | 71 |
@Override |
72 | 72 |
public Request saveRequest(final Request request) { |
73 |
|
|
74 |
System.out.println("Request object -> " + request); |
|
75 |
|
|
73 | 76 |
if (request.getId() == null) { |
74 | 77 |
request.setId(new SimpleDateFormat("yyyyMMdd-").format(new Date()) + requestDAO.getRequestId()); |
75 | 78 |
Budget budget = null; |
76 |
if(request.getPublisher() != null) |
|
79 |
/*if(request.getPublisher() != null)
|
|
77 | 80 |
budget = budgetManager.getForRequest(request.getOrganization().getId(), |
78 | 81 |
request.getPublisher().getEmail()); |
79 | 82 |
|
80 | 83 |
if (budget != null) { |
81 | 84 |
request.setBudget(budget); |
82 | 85 |
// TODO fix amounts |
83 |
// budget.setRemaining(budget.getRemaining() - request.getFundingRequested());
|
|
84 |
// budgetManager.saveBudget(budget);
|
|
85 |
} |
|
86 |
budget.setRemaining(budget.getRemaining() - request.getFundingRequested()); |
|
87 |
budgetManager.saveBudget(budget); |
|
88 |
}*/
|
|
86 | 89 |
} |
87 | 90 |
request.setEligibility(eligibilityManager.validate(request)); |
88 | 91 |
requestDAO.saveRequest(request); |
modules/uoa-goldoa-service/branches/hibernate/src/main/java/eu/dnetlib/goldoa/service/dao/RequestDAO.java | ||
---|---|---|
41 | 41 |
private InvoiceManager invoiceManager; |
42 | 42 |
|
43 | 43 |
public void saveRequest(final Request request) { |
44 |
Request r = getRequest(request.getId()); |
|
45 | 44 |
|
46 |
if(request.getBankAccount()!=null){ |
|
45 |
//Request r = getRequest(request.getId()); |
|
46 |
|
|
47 |
System.out.println("Request on dao object -> " + request); |
|
48 |
|
|
49 |
/*if(request.getBankAccount()!=null){ |
|
47 | 50 |
if(request.getBankAccount().getId() == null) |
48 | 51 |
request.getBankAccount().setId(getBankId()); |
49 | 52 |
} |
... | ... | |
51 | 54 |
if(request.getRequestCoFunders() !=null) { |
52 | 55 |
for (RequestCoFunder rc : request.getRequestCoFunders()) |
53 | 56 |
rc.getPk().setRequest(request); |
54 |
} |
|
57 |
}*/
|
|
55 | 58 |
|
56 |
if ( r == null){ |
|
59 |
/*if ( r == null){
|
|
57 | 60 |
Date date = new Date(); |
58 | 61 |
request.setDate(new Timestamp(date.getTime())); |
59 |
} |
|
62 |
}*/
|
|
60 | 63 |
getSession().saveOrUpdate(request); |
61 | 64 |
} |
62 | 65 |
|
modules/uoa-goldoa-service/branches/hibernate/src/main/java/eu/dnetlib/goldoa/service/eligibility/ProjectEligibiliyManager.java | ||
---|---|---|
87 | 87 |
return new Eligibility(Eligibility.Status.NONO, stillRunningNono); |
88 | 88 |
} else if (enddate.after(new Date(System.currentTimeMillis() - expirationOk * 1000L * 60 * 60 * 24 * 30))) { |
89 | 89 |
return Eligibility.OK; |
90 |
} else if (enddate.after(new Date((long) (System.currentTimeMillis() - (1.0f + expirationThreshold) * expirationOk)))) { |
|
90 |
} else if (enddate.after(new Date((long) (System.currentTimeMillis() - (1.0f + expirationThreshold) * expirationOk* 1000L * 60 * 60 * 24 * 30)))) {
|
|
91 | 91 |
return new Eligibility(Eligibility.Status.IFFY, expirationIffy); |
92 | 92 |
} else { |
93 | 93 |
return new Eligibility(Eligibility.Status.NONO, expirationNono); |
modules/uoa-goldoa-service/branches/hibernate/src/main/java/eu/dnetlib/goldoa/domain/HIbernateDomainConverter.java | ||
---|---|---|
40 | 40 |
return obj; |
41 | 41 |
Class returnType = obj.get(0).getClass(); |
42 | 42 |
String json = mapper.writeValueAsString(obj); |
43 |
System.out.println(json); |
|
44 |
System.out.println(returnType); |
|
45 | 43 |
return mapper.readValue(json,TypeFactory.defaultInstance().constructCollectionType(List.class,returnType)); |
46 | 44 |
} |
47 | 45 |
|
... | ... | |
52 | 50 |
Class returnType = ((MethodSignature) pjp.getSignature()).getMethod().getReturnType(); |
53 | 51 |
ObjectMapper mapper = new ObjectMapper(); |
54 | 52 |
String json = mapper.writeValueAsString(returnType.cast(obj)); |
55 |
System.out.println("Return type: " + returnType); |
|
56 |
System.out.println(json); |
|
57 | 53 |
return mapper.readValue(json, returnType); |
58 | 54 |
} |
59 | 55 |
|
Also available in: Unified diff
- ExpirationOK bug fix