| Line 157... |
Line 157... |
| 157 |
@ApiImplicitParam(name = "Auth-Token", value = "Auth-Token", required = true, dataType = "string", paramType = "header") })
|
157 |
@ApiImplicitParam(name = "Auth-Token", value = "Auth-Token", required = true, dataType = "string", paramType = "header") })
|
| 158 |
public ResponseEntity<?> leadDescription(HttpServletRequest request, @RequestParam(name = "gmailId") String gmailId,
|
158 |
public ResponseEntity<?> leadDescription(HttpServletRequest request, @RequestParam(name = "gmailId") String gmailId,
|
| 159 |
@RequestParam(name = "status") LeadStatus status) throws ProfitMandiBusinessException {
|
159 |
@RequestParam(name = "status") LeadStatus status) throws ProfitMandiBusinessException {
|
| 160 |
AuthUser authUser = authRepository.selectByGmailId(gmailId);
|
160 |
AuthUser authUser = authRepository.selectByGmailId(gmailId);
|
| 161 |
List<Lead> leads = null;
|
161 |
List<Lead> leads = null;
|
| - |
|
162 |
LOGGER.info("emails" + status);
|
| 162 |
if (status.equals(LeadStatus.followUp)) {
|
163 |
if (status.equals(LeadStatus.followUp)) {
|
| - |
|
164 |
|
| 163 |
leads = leadRepository.selectLeadsScheduledBetweenDate(Arrays.asList(authUser.getId()), LocalDateTime.MIN,
|
165 |
leads = leadRepository.selectLeadsScheduledBetweenDate(Arrays.asList(authUser.getId()), null, null);
|
| - |
|
166 |
leads = leads.stream()
|
| - |
|
167 |
.sorted(Comparator.comparing(Lead::getScheduledTimestamp,
|
| - |
|
168 |
Comparator.nullsFirst(Comparator.reverseOrder())))
|
| 164 |
LocalDateTime.MAX);
|
169 |
.collect(Collectors
|
| - |
|
170 |
.toList());/*
|
| 165 |
Collections.sort(leads, (o1, o2) -> {
|
171 |
* Collections.sort(leads, (o1, o2) -> { if (o1.getScheduledTimestamp() != null
|
| 166 |
if (o1.getScheduledTimestamp() != null && o2.getScheduledTimestamp() != null) {
|
172 |
* && o2.getScheduledTimestamp() != null) { return
|
| 167 |
return o1.getScheduledTimestamp().isBefore(o2.getScheduledTimestamp()) ? -1 : 1;
|
173 |
* o1.getScheduledTimestamp().isBefore(o2.getScheduledTimestamp()) ? -1 : 1; }
|
| 168 |
} else if (o1.getScheduledTimestamp() != null) {
|
174 |
* else if (o1.getScheduledTimestamp() != null) { return 1; } else { return -1;
|
| 169 |
return 1;
|
175 |
* } });
|
| 170 |
} else {
|
176 |
*/
|
| 171 |
return -1;
|
- |
|
| 172 |
}
|
- |
|
| 173 |
});
|
- |
|
| 174 |
;
|
177 |
|
| 175 |
} else {
|
178 |
} else {
|
| 176 |
leads = leadRepository.selectByAssignAuthIdAndStatus(authUser.getId(), status);
|
179 |
leads = leadRepository.selectByAssignAuthIdAndStatus(authUser.getId(), status);
|
| 177 |
|
180 |
|
| 178 |
}
|
181 |
}
|
| 179 |
|
182 |
|