RenJuan/TASKPM
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Bug #1489: Change attribute name and constructor in UpdateDeliveringDateDTO to

Browse source 
resemble SubcontractedTaskDataDTO and prevent confusions.

FEA: ItEr76S04BugFixing
This commit is contained in:
Jacobo Aragunde Pérez 2012-07-11 13:19:51 +02:00
parent 6603e8dd92
commit 1eeddaf0f2
3 changed files with 11 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
libreplan-webapp/src/main/java/org/libreplan/web/subcontract/UpdateDeliveringDateDTO.java
View file

@ -19,15 +19,10 @@
package org.libreplan.web.subcontract;
import java.util.Date;
import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.datatype.XMLGregorianCalendar;
import org.libreplan.business.planner.entities.SubcontractedTaskData;
import org.libreplan.ws.common.impl.DateConverter;
/**
* DTO UpdateDeliveringDate
*
@ -43,7 +38,7 @@ public class UpdateDeliveringDateDTO {
public String externalCode;
@XmlAttribute(name = "external-company-nif")
public String companyNif;
public String externalCompanyNif;
@XmlAttribute(name = "deliver-date")
public XMLGregorianCalendar deliverDate;
@ -51,11 +46,12 @@ public class UpdateDeliveringDateDTO {
public UpdateDeliveringDateDTO(){
}
public UpdateDeliveringDateDTO(String customerReference,
String externalCode, String companyNif, XMLGregorianCalendar deliverDate) {
public UpdateDeliveringDateDTO(String externalCompanyNif,
String customerReference, String externalCode,
XMLGregorianCalendar deliverDate) {
this.customerReference = customerReference;
this.deliverDate = deliverDate;
this.companyNif = companyNif;
this.externalCompanyNif = externalCompanyNif;
this.externalCode = externalCode;
}
}

10
libreplan-webapp/src/main/java/org/libreplan/ws/subcontract/impl/SubcontractServiceREST.java
View file

@ -153,8 +153,8 @@ public class SubcontractServiceREST implements ISubcontractService {
private void updateSubcontract(
final UpdateDeliveringDateDTO updateDeliveringDateDTO) {
if (StringUtils.isEmpty(updateDeliveringDateDTO.companyNif)) {
throw new ViolationError(updateDeliveringDateDTO.companyNif,
if (StringUtils.isEmpty(updateDeliveringDateDTO.externalCompanyNif)) {
throw new ViolationError(updateDeliveringDateDTO.externalCompanyNif,
"external company Nif not specified");
}
@ -172,11 +172,11 @@ public class SubcontractServiceREST implements ISubcontractService {
.runOnTransaction(new IOnTransaction<ExternalCompany>() {
@Override
public ExternalCompany execute() {
return findExternalCompanyFor(updateDeliveringDateDTO.companyNif);
return findExternalCompanyFor(updateDeliveringDateDTO.externalCompanyNif);
}
});
if (!externalCompany.isClient()) {
throw new ViolationError(updateDeliveringDateDTO.companyNif,
throw new ViolationError(updateDeliveringDateDTO.externalCompanyNif,
"external company is not registered as client");
}
try {
@ -192,7 +192,7 @@ public class SubcontractServiceREST implements ISubcontractService {
} catch (ValidationException e) {
InstanceConstraintViolationsDTO violation = ConstraintViolationConverter
.toDTO(new InstanceConstraintViolationsDTOId(Long.valueOf(1),
updateDeliveringDateDTO.companyNif, OrderDTO.ENTITY_TYPE), e);
updateDeliveringDateDTO.externalCompanyNif, OrderDTO.ENTITY_TYPE), e);
throw new ViolationError(violation);
}
}

2
libreplan-webapp/src/main/java/org/libreplan/ws/subcontract/impl/SubcontractedTaskDataConverter.java
View file

@ -59,7 +59,7 @@ public final class SubcontractedTaskDataConverter {
deliverDate = toXmlDate(subTaskData.getRequiredDeliveringDates().first().getSubcontractorDeliverDate());
}
String externalCode = subTaskData.getTask().getOrderElement().getCode();
return new UpdateDeliveringDateDTO(customerReference, externalCode, companyCode, deliverDate);
return new UpdateDeliveringDateDTO(companyCode, customerReference, externalCode, deliverDate);
}
private final static XMLGregorianCalendar toXmlDate(Date date) {