fix(m360-api): codec rework

vincejv · Aug 30, 2023 · 5f799da · 5f799da
1 parent 60c91e4
commit 5f799da
Show file tree

Hide file tree

Showing 6 changed files with 38 additions and 39 deletions.
diff --git a/core/src/main/java/com/abavilla/fpi/sms/codec/M360CodecProvider.java b/core/src/main/java/com/abavilla/fpi/sms/codec/M360CodecProvider.java
@@ -38,8 +38,7 @@
  */
 public class M360CodecProvider implements CodecProvider {
 
-  @SuppressWarnings("rawtypes")
-  private static final List<Class> discriminatorClasses;
+  private static final List<Class<?>> discriminatorClasses;
 
   private static final List<String> ignoredFields;
 
@@ -60,13 +59,13 @@ public <T> Codec<T> get(Class<T> clazz, CodecRegistry registry) {
   }
 
   private <T> Codec<T> buildDiscriminatorCodec(Class<T> clazz, CodecRegistry registry) {
-    var dscmntrMdlBldr = ClassModel.builder(clazz)
+    var discriminatorModelBuilder = ClassModel.builder(clazz)
       .enableDiscriminator(true);
     if (clazz == BroadcastRequest.class) {
-      stripNonProperties(dscmntrMdlBldr);
+      stripNonProperties(discriminatorModelBuilder);
     }
     return PojoCodecProvider.builder()
-      .register(dscmntrMdlBldr.build())
+      .register(discriminatorModelBuilder.build())
       .build().get(clazz, registry);
   }
 

diff --git a/core/src/main/java/com/abavilla/fpi/sms/entity/sms/MsgReq.java b/core/src/main/java/com/abavilla/fpi/sms/entity/sms/MsgReq.java
@@ -25,6 +25,7 @@
 import com.abavilla.fpi.telco.ext.enums.Telco;
 import com.vincejv.m360.dto.ApiRequest;
 import io.quarkus.mongodb.panache.common.MongoEntity;
+import io.quarkus.runtime.annotations.RegisterForReflection;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
@@ -33,6 +34,7 @@
 
 @Data
 @EqualsAndHashCode(callSuper = true)
+@RegisterForReflection
 @NoArgsConstructor
 @BsonDiscriminator
 @MongoEntity(collection="m360_log")
@@ -49,6 +51,6 @@ public class MsgReq extends AbsMongoItem {
   private String messageId;
   private List<StateEncap> apiStatus;
   private List<String> message;
-  @BsonProperty("request")
+  @BsonProperty(value = "request", useDiscriminator = true)
   private ApiRequest broadcastRequest;
 }
diff --git a/core/src/main/java/com/abavilla/fpi/sms/mapper/sms/MsgReqMapper.java b/core/src/main/java/com/abavilla/fpi/sms/mapper/sms/MsgReqMapper.java
@@ -40,6 +40,7 @@ public interface MsgReqMapper extends IDtoToEntityMapper<MsgReqDto, MsgReq> {
   MsgReq mapToEntity(MsgReqDto dto);
 
   MsgReq mapFromResponse(BroadcastResponseDto broadcastResponseDto);
+
   @AfterMapping
   default void afterMappingFromResponse(BroadcastResponseDto broadcastResponseDto, @MappingTarget MsgReq msgReq) {
     msgReq.setTelco(Telco.fromId(broadcastResponseDto.getTelcoId()));

diff --git a/core/src/main/java/com/abavilla/fpi/sms/service/sms/M360Svc.java b/core/src/main/java/com/abavilla/fpi/sms/service/sms/M360Svc.java
@@ -22,7 +22,6 @@
 
 import com.abavilla.fpi.fw.exceptions.ApiSvcEx;
 import com.abavilla.fpi.fw.service.ISvc;
-import com.abavilla.fpi.fw.util.DateUtil;
 import com.abavilla.fpi.sms.dto.api.m360.BroadcastResponseDto;
 import com.abavilla.fpi.sms.entity.enums.DCSCoding;
 import com.abavilla.fpi.sms.ext.dto.MsgReqDto;
@@ -64,7 +63,6 @@ public Uni<BroadcastResponseDto> sendMsg(MsgReqDto msgReqDto) {
       } else { // fail
         dto.setCode(resp.getCode());
         dto.setName(HttpResponseStatus.valueOf(resp.getCode()).reasonPhrase());
-        dto.setTimestamp(DateUtil.now());
         dto.setMessage(resp.getErrors().stream().map(ApiError::getMessage).collect(Collectors.toList()));
       }
       dto.setBroadcastRequest(smsRequest);

diff --git a/core/src/main/java/com/abavilla/fpi/sms/service/sms/MsgAckSvc.java b/core/src/main/java/com/abavilla/fpi/sms/service/sms/MsgAckSvc.java
@@ -59,36 +59,35 @@ public Uni<Void> acknowledge(String msgId, String ackStsCde, String ackTimestamp
     var byMsgId = msgReqRepo.findByMsgId(msgId);
 
     /* run in background, immediately return response to webhook */
-    executor.execute(() ->
-      byMsgId.map(msgReqOpt -> msgReqOpt.orElseThrow(() ->
-          new ApiSvcEx("Message Id for acknowledgement not found: " + msgId)))
-        .onFailure(OptimisticLockEx.class).retry().indefinitely()
-        .onFailure(ApiSvcEx.class)
-        .retry().withBackOff(Duration.ofSeconds(3)).withJitter(0.2)
-        .atMost(5) // Retry for item not found and nothing else
-        .chain(msgReq -> {
-          var stateItem = new StateEncap(apiStatus, ackTime);
-          if (ObjectUtils.isEmpty(msgReq.getApiStatus())) {
-            msgReq.setApiStatus(List.of(stateItem));
-          } else {
-            msgReq.getApiStatus().add(stateItem);
-          }
-          msgReq.setLastAcknowledgement(ackTime);
-          msgReq.setDateUpdated(LocalDateTime.now(ZoneOffset.UTC));
-          return msgReqRepo.persistOrUpdate(msgReq);
-        })
-        .onFailure().call(ex -> {
-          Log.error("Error leak ack", ex);
-          var leak = new LeakAck();
-          leak.setDateCreated(LocalDateTime.now(ZoneOffset.UTC));
-          leak.setDateUpdated(LocalDateTime.now(ZoneOffset.UTC));
-          leak.setMsgId(msgId);
-          leak.setApiStatus(apiStatus);
-          leak.setTimestamp(ackTime);
-          return repo.persist(leak);
-        })
-        .await().indefinitely()
-    );
+    byMsgId.map(msgReqOpt -> msgReqOpt.orElseThrow(() ->
+        new ApiSvcEx("Message Id for acknowledgement not found: " + msgId)))
+      .onFailure(OptimisticLockEx.class).retry().indefinitely()
+      .onFailure(ApiSvcEx.class)
+      .retry().withBackOff(Duration.ofSeconds(3)).withJitter(0.2)
+      .atMost(5) // Retry for item not found and nothing else
+      .chain(msgReq -> {
+        var stateItem = new StateEncap(apiStatus, ackTime);
+        if (ObjectUtils.isEmpty(msgReq.getApiStatus())) {
+          msgReq.setApiStatus(List.of(stateItem));
+        } else {
+          msgReq.getApiStatus().add(stateItem);
+        }
+        msgReq.setLastAcknowledgement(ackTime);
+        msgReq.setDateUpdated(LocalDateTime.now(ZoneOffset.UTC));
+        return msgReqRepo.update(msgReq);
+      })
+      .onFailure().call(ex -> {
+        Log.error("Error leak ack", ex);
+        var leak = new LeakAck();
+        leak.setDateCreated(LocalDateTime.now(ZoneOffset.UTC));
+        leak.setDateUpdated(LocalDateTime.now(ZoneOffset.UTC));
+        leak.setMsgId(msgId);
+        leak.setApiStatus(apiStatus);
+        leak.setTimestamp(ackTime);
+        return repo.persist(leak);
+      })
+      .subscribe().with(ignored -> {
+      });
 
     return Uni.createFrom().voidItem();
   }

diff --git a/pom.xml b/pom.xml
@@ -98,7 +98,7 @@
       <dependency>
         <groupId>com.vincejv</groupId>
         <artifactId>m360-api-client</artifactId>
-        <version>1.0.5</version>
+        <version>1.0.7</version>
       </dependency>
 
     </dependencies>