Skip to content
Merged
Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ plugins {
}

group = 'com.flexcodelabs'
version = '0.0.61'
version = '0.0.62'
description = 'Flextuma App'

java {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,6 @@ public enum SmsLogStatus {
PROCESSING,
SENT,
FAILED,
DELIVERED
DELIVERED,
READ
}
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
@RequiredArgsConstructor
public class DashboardService {

private static final EnumSet<SmsLogStatus> SUCCESS_STATUSES = EnumSet.of(SmsLogStatus.SENT, SmsLogStatus.DELIVERED);
private static final EnumSet<SmsLogStatus> SUCCESS_STATUSES = EnumSet.of(SmsLogStatus.SENT, SmsLogStatus.DELIVERED, SmsLogStatus.READ);
private static final EnumSet<SmsCampaignStatus> ACTIVE_CAMPAIGN_STATUSES = EnumSet.of(
SmsCampaignStatus.SCHEDULED,
SmsCampaignStatus.PROCESSING);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -134,15 +134,34 @@ private void updateDeliveryStatus(Map<String, Object> payload) {
}
}

// sent < delivered < read: Meta's status callbacks can arrive out of order (or duplicated),
// and without this a late "delivered" retry could visibly regress an already-READ message's
// blue ticks back to gray. FAILED isn't in this progression -- it's a terminal outcome, not
// a step past it.
private static final List<SmsLogStatus> DELIVERY_PROGRESSION = List.of(SmsLogStatus.SENT, SmsLogStatus.DELIVERED, SmsLogStatus.READ);

@SuppressWarnings("unchecked")
private void applyStatus(SmsLog logEntry, String status, Map<String, Object> raw) {
if ("delivered".equalsIgnoreCase(status) || "read".equalsIgnoreCase(status)) logEntry.setStatus(SmsLogStatus.DELIVERED);
else if ("failed".equalsIgnoreCase(status)) { logEntry.setStatus(SmsLogStatus.FAILED); logEntry.setError(extractErrorMessage(raw)); }
else if ("sent".equalsIgnoreCase(status)) logEntry.setStatus(SmsLogStatus.SENT);
SmsLogStatus next;
if ("read".equalsIgnoreCase(status)) next = SmsLogStatus.READ;
else if ("delivered".equalsIgnoreCase(status)) next = SmsLogStatus.DELIVERED;
else if ("failed".equalsIgnoreCase(status)) next = SmsLogStatus.FAILED;
else if ("sent".equalsIgnoreCase(status)) next = SmsLogStatus.SENT;
else return;

if (next != SmsLogStatus.FAILED && isDeliveryRegression(logEntry.getStatus(), next)) return;

logEntry.setStatus(next);
if (next == SmsLogStatus.FAILED) logEntry.setError(extractErrorMessage(raw));
smsLogRepository.save(logEntry);
}

private boolean isDeliveryRegression(SmsLogStatus current, SmsLogStatus next) {
int currentIndex = DELIVERY_PROGRESSION.indexOf(current);
int nextIndex = DELIVERY_PROGRESSION.indexOf(next);
return currentIndex >= 0 && nextIndex >= 0 && nextIndex < currentIndex;
}

private String extractErrorMessage(Map<String, Object> raw) {
Object errors = raw.get("errors");
if (!(errors instanceof List<?> list) || list.isEmpty() || !(list.get(0) instanceof Map<?, ?> first)) return null;
Expand Down