Merge pull request #1969 from CreditMutuelArkea/fix/DERCBOT-1676_fix_search_inconsistency

assouktim · web-flow · commit 6612ed6c3d09 · 2026-02-04T11:22:33.000+01:00
[DERCBOT-1676] Fix dialog date filters and add comprehensive tests
diff --git a/.gitignore b/.gitignore
@@ -18,6 +18,7 @@ environment.dev.ts
 *.launch
 .settings/
 *.sublime-workspace
+.cursor/*
 
 # IDE - VSCode
 .vscode/*
diff --git a/bot/admin/server/src/main/kotlin/model/DialogsSearchQuery.kt b/bot/admin/server/src/main/kotlin/model/DialogsSearchQuery.kt
@@ -49,9 +49,9 @@ data class DialogsSearchQuery(
     val dialogSort: SortDirection? = null,
     val annotationCreationDateFrom: ZonedDateTime? = null,
     val annotationCreationDateTo: ZonedDateTime? = null,
-    val dialogCreationDateFrom: ZonedDateTime? = null,
-    val dialogCreationDateTo: ZonedDateTime? = null,
     val feedback: FeedbackVote? = null,
+    val dialogActivityFrom: ZonedDateTime? = null,
+    val dialogActivityTo: ZonedDateTime? = null,
 ) : PaginatedQuery() {
     fun toDialogReportQuery(): DialogReportQuery {
         return DialogReportQuery(
@@ -79,9 +79,9 @@ data class DialogsSearchQuery(
             dialogSort = dialogSort,
             annotationCreationDateFrom = annotationCreationDateFrom,
             annotationCreationDateTo = annotationCreationDateTo,
-            dialogCreationDateFrom = dialogCreationDateFrom,
-            dialogCreationDateTo = dialogCreationDateTo,
             feedback = feedback,
+            dialogActivityFrom = dialogActivityFrom,
+            dialogActivityTo = dialogActivityTo,
         )
     }
 }
diff --git a/bot/admin/web/src/app/analytics/dialogs/dialogs-list/dialogs-list-filters/dialogs-list-filters.component.html b/bot/admin/web/src/app/analytics/dialogs/dialogs-list/dialogs-list-filters/dialogs-list-filters.component.html
@@ -111,16 +111,16 @@
                 placeholder="Data collected after"
                 nbTooltip="Show dialogs containing messages created after this date"
                 [nbDatepicker]="from_date"
-                formControlName="dialogCreationDateFrom"
+                formControlName="dialogActivityFrom"
               />
               <button
-                *ngIf="!!getFormControl('dialogCreationDateFrom').value"
+                *ngIf="!!getFormControl('dialogActivityFrom').value"
                 nbButton
                 nbSuffix
                 ghost
                 nbTooltip="Clear"
                 type="button"
-                (click)="resetControl(getFormControl('dialogCreationDateFrom'))"
+                (click)="resetControl(getFormControl('dialogActivityFrom'))"
               >
                 <nb-icon icon="x"></nb-icon>
               </button>
@@ -148,16 +148,16 @@
                 placeholder="Data collected before"
                 nbTooltip="Show dialogs containing messages created before this date"
                 [nbDatepicker]="to_date"
-                formControlName="dialogCreationDateTo"
+                formControlName="dialogActivityTo"
               />
               <button
-                *ngIf="!!getFormControl('dialogCreationDateTo').value"
+                *ngIf="!!getFormControl('dialogActivityTo').value"
                 nbButton
                 nbSuffix
                 ghost
                 nbTooltip="Clear"
                 type="button"
-                (click)="resetControl(getFormControl('dialogCreationDateTo'))"
+                (click)="resetControl(getFormControl('dialogActivityTo'))"
               >
                 <nb-icon icon="x"></nb-icon>
               </button>
diff --git a/bot/admin/web/src/app/analytics/dialogs/dialogs-list/dialogs-list-filters/dialogs-list-filters.component.ts b/bot/admin/web/src/app/analytics/dialogs/dialogs-list/dialogs-list-filters/dialogs-list-filters.component.ts
@@ -49,8 +49,8 @@ interface DialogListFiltersForm {
   intentsToHide?: FormControl<string[]>;
   isGenAiRagDialog?: FormControl<boolean>;
   dialogSort?: FormControl<SortOrder>;
-  dialogCreationDateFrom?: FormControl<Date>;
-  dialogCreationDateTo?: FormControl<Date>;
+  dialogActivityFrom?: FormControl<Date>;
+  dialogActivityTo?: FormControl<Date>;
   withAnnotations?: FormControl<boolean>;
   annotationStates?: FormControl<AnnotationState[]>;
   annotationReasons?: FormControl<AnnotationReason[]>;
@@ -126,8 +126,8 @@ export class DialogsListFiltersComponent implements OnInit {
     intentsToHide: new FormControl([]),
     isGenAiRagDialog: new FormControl(),
     dialogSort: new FormControl(),
-    dialogCreationDateFrom: new FormControl(),
-    dialogCreationDateTo: new FormControl(),
+    dialogActivityFrom: new FormControl(),
+    dialogActivityTo: new FormControl(),
     withAnnotations: new FormControl(),
     annotationStates: new FormControl([]),
     annotationReasons: new FormControl([]),
diff --git a/bot/admin/web/src/app/analytics/dialogs/dialogs-list/dialogs-list.component.ts b/bot/admin/web/src/app/analytics/dialogs/dialogs-list/dialogs-list.component.ts
@@ -149,8 +149,8 @@ export class DialogsListComponent implements OnInit, OnChanges, OnDestroy {
       this.filters.intentsToHide,
       this.filters.isGenAiRagDialog,
       this.filters.dialogSort,
-      this.filters.dialogCreationDateFrom,
-      this.filters.dialogCreationDateTo,
+      this.filters.dialogActivityFrom,
+      this.filters.dialogActivityTo,
       this.filters.withAnnotations,
       this.filters.annotationStates,
       this.filters.annotationReasons,
diff --git a/bot/admin/web/src/app/analytics/dialogs/dialogs.ts b/bot/admin/web/src/app/analytics/dialogs/dialogs.ts
@@ -43,8 +43,8 @@ export class DialogReportQuery extends PaginatedQuery {
     public intentsToHide?: string[],
     public isGenAiRagDialog?: boolean,
     public dialogSort?: SortOrder,
-    public dialogCreationDateFrom?: Date,
-    public dialogCreationDateTo?: Date,
+    public dialogActivityFrom?: Date,
+    public dialogActivityTo?: Date,
     public withAnnotations?: boolean,
     public annotationStates?: AnnotationState[],
     public annotationReasons?: AnnotationReason[],
diff --git a/bot/engine/src/main/kotlin/admin/dialog/DialogReportQuery.kt b/bot/engine/src/main/kotlin/admin/dialog/DialogReportQuery.kt
@@ -39,8 +39,6 @@ data class DialogReportQuery(
     val dialogId: String? = null,
     val intentName: String? = null,
     val exactMatch: Boolean = false,
-    val from: ZonedDateTime? = null,
-    val to: ZonedDateTime? = null,
     val connectorType: ConnectorType? = null,
     /**
      * Display test dialogs.
@@ -68,7 +66,15 @@ data class DialogReportQuery(
     val dialogSort: SortDirection? = null,
     val annotationCreationDateFrom: ZonedDateTime? = null,
     val annotationCreationDateTo: ZonedDateTime? = null,
-    val dialogCreationDateFrom: ZonedDateTime? = null,
-    val dialogCreationDateTo: ZonedDateTime? = null,
     val feedback: FeedbackVote? = null,
+    /**
+     * Filter dialogs that had activity during the specified period.
+     * A dialog is included if:
+     * - At least one action exists with date >= dialogActivityFrom (if set)
+     * - At least one action exists with date <= dialogActivityTo (if set)
+     * Note: These conditions can be satisfied by different actions.
+     * Both bounds are inclusive.
+     */
+    val dialogActivityFrom: ZonedDateTime? = null,
+    val dialogActivityTo: ZonedDateTime? = null,
 )
diff --git a/bot/storage-mongo/src/main/kotlin/UserTimelineMongoDAO.kt b/bot/storage-mongo/src/main/kotlin/UserTimelineMongoDAO.kt
@@ -112,10 +112,12 @@ import org.litote.kmongo.eq
 import org.litote.kmongo.from
 import org.litote.kmongo.group
 import org.litote.kmongo.gt
+import org.litote.kmongo.gte
 import org.litote.kmongo.`in`
 import org.litote.kmongo.json
 import org.litote.kmongo.limit
 import org.litote.kmongo.lt
+import org.litote.kmongo.lte
 import org.litote.kmongo.match
 import org.litote.kmongo.not
 import org.litote.kmongo.orderBy
@@ -737,8 +739,6 @@ internal object UserTimelineMongoDAO : UserTimelineDAO, UserReportDAO, DialogRep
                                     if (query.playerId != null || query.displayTests) null else Test eq false,
                                     if (query.playerId == null) null else PlayerIds.id eq query.playerId!!.id,
                                     if (dialogIds.isEmpty()) null else _id `in` dialogIds,
-                                    if (from == null) null else DialogCol_.LastUpdateDate gt from?.toInstant(),
-                                    if (to == null) null else DialogCol_.LastUpdateDate lt to?.toInstant(),
                                     if (connectorType == null) null else Stories.actions.state.targetConnectorType.id eq connectorType!!.id,
                                     if (query.intentName.isNullOrBlank()) null else Stories.currentIntent.name_ eq query.intentName,
                                     if (query.ratings.isNotEmpty()) DialogCol_.Rating `in` query.ratings.toSet() else null,
@@ -758,23 +758,17 @@ internal object UserTimelineMongoDAO : UserTimelineDAO, UserReportDAO, DialogRep
                                     if (annotationCreationDateFrom == null) {
                                         null
                                     } else {
-                                        Stories.actions.annotation.creationDate gt annotationCreationDateFrom?.toInstant()
+                                        Stories.actions.annotation.creationDate gte annotationCreationDateFrom?.toInstant()
                                     },
                                     if (annotationCreationDateTo == null) {
                                         null
                                     } else {
-                                        Stories.actions.annotation.creationDate lt annotationCreationDateTo?.toInstant()
-                                    },
-                                    if (dialogCreationDateFrom == null) {
-                                        null
-                                    } else {
-                                        Stories.actions.date gt dialogCreationDateFrom?.toInstant()
-                                    },
-                                    if (dialogCreationDateTo == null) {
-                                        null
-                                    } else {
-                                        Stories.actions.date lt dialogCreationDateTo?.toInstant()
+                                        Stories.actions.annotation.creationDate lte annotationCreationDateTo?.toInstant()
                                     },
+                                    buildDialogActivityFilter(
+                                        query.dialogActivityFrom,
+                                        query.dialogActivityTo,
+                                    ),
                                 )
                             logger.debug { "dialog search query: $filter" }
                             val c = dialogCol.withReadPreference(secondaryPreferred())
@@ -1204,6 +1198,32 @@ internal object UserTimelineMongoDAO : UserTimelineDAO, UserReportDAO, DialogRep
         toDate?.let { filters += lte("stories.actions.date", it.toInstant()) }
     }
 
+    /**
+     * Builds a filter for dialogs that had activity during the specified period.
+     *
+     * A dialog is included if:
+     * - At least one action exists with date >= activityFrom (if set)
+     * - At least one action exists with date <= activityTo (if set)
+     *
+     * Note: These conditions can be satisfied by different actions.
+     * Both bounds are inclusive.
+     *
+     * @param activityFrom optional start date filter (inclusive)
+     * @param activityTo optional end date filter (inclusive)
+     * @return Bson filter expression, or null if both dates are null
+     */
+    private fun buildDialogActivityFilter(
+        activityFrom: ZonedDateTime?,
+        activityTo: ZonedDateTime?,
+    ): Bson? {
+        val conditions =
+            listOfNotNull(
+                activityFrom?.let { Stories.actions.date gte it.toInstant() },
+                activityTo?.let { Stories.actions.date lte it.toInstant() },
+            )
+        return if (conditions.isEmpty()) null else and(conditions)
+    }
+
     /**
      * Calculates dialog statistics for a given [DialogStatsQuery].
      *
diff --git a/bot/storage-mongo/src/test/kotlin/UserTimelineMongoDAOTest.kt b/bot/storage-mongo/src/test/kotlin/UserTimelineMongoDAOTest.kt
