Merge branch 'release-4.9.0' of https://github.com/samagra-comms/dao …

…into v2-integration
samagra-comms · Jul 19, 2022 · f0bd6bc · f0bd6bc
2 parents ec5fcf7 + 5378453
commit f0bd6bc
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 31 deletions.
diff --git a/src/main/java/com/uci/dao/config/CassandraConfig.java b/src/main/java/com/uci/dao/config/CassandraConfig.java
@@ -124,7 +124,7 @@ protected List<String> getMigrationScripts() {
         allScripts.add("ALTER TABLE " + keyspace + ".XMessage ADD sessionId uuid;");
         allScripts.add("ALTER TABLE " + keyspace + ".XMessage ADD ownerOrgId text;");
         allScripts.add("ALTER TABLE " + keyspace + ".XMessage ADD ownerId text;");
-
+        allScripts.add("ALTER TABLE " + keyspace + ".XMessage ADD botUuid uuid;");
 
 //        allScripts.add("CREATE INDEX IF NOT EXISTS message_state_index\n" +
 //                "ON "+keyspace

diff --git a/src/main/java/com/uci/dao/models/XMessageDAO.java b/src/main/java/com/uci/dao/models/XMessageDAO.java
@@ -66,4 +66,7 @@ public class XMessageDAO implements Serializable {
 
     @Column
     private String ownerId;
+
+    @Column
+    private UUID botUuid;
 }
diff --git a/src/main/java/com/uci/dao/repository/XMessageRepository.java b/src/main/java/com/uci/dao/repository/XMessageRepository.java
@@ -26,57 +26,27 @@ public interface XMessageRepository extends ReactiveCassandraRepository<XMessage
 
 	@AllowFiltering
 	Mono<Boolean> existsByUserId(String userID);
-
-    Flux<List<XMessageDAO>> findAllByFromIdOrderByTimestampDesc(String fromID);
-
-    Flux<XMessageDAO> findFirstByFromIdOrderByTimestampDesc(String fromID);
-
-    Flux<XMessageDAO> findFirstByAppOrderByTimestampDesc(String appName);
-
-    @AllowFiltering
-    Flux<XMessageDAO> findAllByUserId(Pageable pageable, String userID);
-
-    Flux<XMessageDAO> findByMessageId(String messageID);
-
-    Flux<XMessageDAO> findFirstByReplyIdOrderByTimestampDesc(String replyId);
-
-    Flux<XMessageDAO> findFirstByCauseIdAndMessageStateOrderByTimestampDesc(String causeId, String messageState);
-
-    @AllowFiltering
-    Flux<List<XMessageDAO>> findAllByUserIdOrderByTimestampDesc(String userID);
 
     @AllowFiltering
     Flux<XMessageDAO> findAllByUserIdAndTimestampAfter(String userID, LocalDateTime timestamp);
 
-    Flux<XMessageDAO> findTopByFromIdAndMessageStateOrderByTimestampDesc(String fromId, String messageState);
-
     Flux<XMessageDAO> findFirstByUserIdAndCauseIdAndMessageStateOrderByTimestampDesc(String userId, String causeId, String messageState);
 
-    Flux<XMessageDAO> findTopByUserIdOrderByTimestampDesc(String userId);
-
     @AllowFiltering
     Flux<XMessageDAO> findAllByFromIdAndTimestampAfter(String userID, LocalDateTime timestamp);
 
     @AllowFiltering
     Flux<XMessageDAO> findById(UUID uuid);
 
-    Flux<XMessageDAO> findByXMessageAndUserId(XMessage xmsg, String userID);
-
     @AllowFiltering
     Flux<XMessageDAO> findFirstByAppAndUserIdAndFromIdAndMessageStateOrderByTimestampDesc(String app, String userID, String fromId, String messageState);
 
-    @AllowFiltering
-    Flux<XMessageDAO> findAllByUserIdOrderByTimestamp(String userID);
-
     @AllowFiltering
     Flux<Slice<XMessageDAO>> findAllByUserIdAndFromId(Pageable paging, String userID, String fromID);
 
     @AllowFiltering
     Mono<Slice<XMessageDAO>> findAllByAppAndTimestampAfterAndTimestampBeforeAndProvider(Pageable paging, String name, Timestamp startDate, Timestamp endDate, String provider);
 
-    @AllowFiltering
-    Mono<Slice<XMessageDAO>> findAllByUserIdAndTimestampAfterAndTimestampBeforeAndProvider(Pageable paging, String  userId, Timestamp startDate, Timestamp endDate, String provider);
-
     @AllowFiltering
     Mono<Slice<XMessageDAO>> findAllByUserIdInAndFromIdInAndTimestampAfterAndTimestampBeforeAndProvider(Pageable paging, List<String>  listUserId, List<String> listFromId, Timestamp startDate, Timestamp endDate, String provider);
 

diff --git a/src/main/java/com/uci/dao/utils/XMessageDAOUtils.java b/src/main/java/com/uci/dao/utils/XMessageDAOUtils.java
@@ -51,6 +51,7 @@ public static XMessageDAO convertXMessageToDAO(XMessage xmsg) {
         xmsgDao.setSessionId(xmsg.getSessionId());
         xmsgDao.setOwnerOrgId(xmsg.getOwnerOrgId());
         xmsgDao.setOwnerId(xmsg.getOwnerId());
+        xmsgDao.setBotUuid(xmsg.getBotId());
 
         LocalDateTime triggerTime =
                 LocalDateTime.ofInstant(Instant.ofEpochMilli(xmsg.getTimestamp()),
-Original file line number
+Diff line change
@@ Expand Up / @@ -66,4 +66,7 @@ public class XMessageDAO implements Serializable { @@
         @Column
         private String ownerId;
+        @Column
+        private UUID botUuid;
     }