Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 13 additions & 5 deletions src/main/java/com/iemr/flw/service/impl/IncentiveServiceImpl.java
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,20 @@
import com.iemr.flw.repo.iemr.IncentivesRepo;
import com.iemr.flw.service.IncentiveService;
import org.modelmapper.ModelMapper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import java.util.ArrayList;
import java.util.List;
import java.util.Objects;
import java.util.stream.Collectors;

@Service
public class IncentiveServiceImpl implements IncentiveService {

private final Logger logger = LoggerFactory.getLogger(IncentiveServiceImpl.class);

ModelMapper modelMapper = new ModelMapper();

Expand All @@ -46,11 +50,15 @@ public String saveIncentivesMaster(List<IncentiveActivityDTO> activityDTOS) {
}
incentivesRepo.save(activity);
});
String saved = "";
activityDTOS.forEach(dto -> saved.concat(dto.getGroup() + ": " + dto.getName()));
return "saved master data for " + saved ;
StringBuilder saved = new StringBuilder();
activityDTOS.forEach(dto -> saved.append(Objects.toString(dto.getGroup(), "")).append(": ").append(Objects.toString(dto.getName(), "")).append(", "));
// Remove trailing ", " if present
if (saved.length() > 0) {
saved.setLength(saved.length() - 2);
}
return "saved master data for " + saved.toString();
} catch (Exception e) {

logger.error("Error saving incentive master data: " + e.getMessage(), e);
}
return null;
}
Expand All @@ -66,7 +74,7 @@ public String getIncentiveMaster(IncentiveRequestDTO incentiveRequestDTO) {
Gson gson = new GsonBuilder().setDateFormat("MMM dd, yyyy h:mm:ss a").create();
return gson.toJson(dtos);
} catch (Exception e) {

logger.error("Error getting incentive master data: " + e.getMessage(), e);
}
return null;
}
Expand Down