Commit b0d4957a authored by jgomez's avatar jgomez

Correcciones generales en Writter

parent 24878427
......@@ -83,6 +83,9 @@ public class DataSensibleJPAWriter implements ItemWriter<DynaBean>, StepExecutio
presentDate = presentDate.replace(timeZone, "");
String senderId = (String) JsonUtils.getFieldFromJson(json, "$.metadata.sender_id");
if (senderId.isEmpty()) {
senderId = (String) JsonUtils.getFieldFromJson(json, "$.sender_id");
}
List<DeleteDataSensRegistryBean> deleteSensibleBean = service.deleteMessage(agent.getAgenId()
, SmSMessageSid, intenId.get().getId(), senderId);
......@@ -99,15 +102,13 @@ public class DataSensibleJPAWriter implements ItemWriter<DynaBean>, StepExecutio
DeleteDataSensibleControl control = new DeleteDataSensibleControl();
Optional<DeleteDataSensibleControl> controlBd = deleteDataSensibleControlRepository.findEventIdByAgentId(agent.getAgenId());
if (controlBd.isPresent()) {
// Update
DeleteDataSensControlBean controlbean = new DeleteDataSensControlBean();
controlbean.setId(controlBd.get().getId());
controlbean.setEventId(id);
controlbean.setAgenId(agent.getAgenId());
controlbean.setDateDelete(Timestamp.valueOf(presentDate));
control = toModel(control, controlbean);
control.setId(controlBd.get().getId());
control.setAgentId(agent.getAgenId());
control.setEventId(id);
control.setDate(Timestamp.valueOf(presentDate));
deleteDataSensibleControlRepository.save(control);
} else {
// Create
......@@ -124,14 +125,6 @@ public class DataSensibleJPAWriter implements ItemWriter<DynaBean>, StepExecutio
//service.saveDataSensControl(eventBean.getId(), eventBean.getSenderId());
}
protected DeleteDataSensibleControl toModel(DeleteDataSensibleControl model, DeleteDataSensControlBean bean) {
if (model == null) {
model = new DeleteDataSensibleControl();
}
BeanUtils.copyProperties(model, bean);
return model;
}
@Override
public void beforeStep(StepExecution stepExecution) {
String tenantId = stepExecution.getJobParameters().getString("tenantId");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment