Fix

Unleash · Mar 5, 2024 · e8284c6 · e8284c6
1 parent f44828b
commit e8284c6
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 9 deletions.
diff --git a/src/lib/features/feature-toggle/feature-toggle-store.ts b/src/lib/features/feature-toggle/feature-toggle-store.ts
@@ -300,10 +300,11 @@ export default class FeatureToggleStore implements IFeatureToggleStore {
             .count('type')
             .groupBy('type');
 
-        query.where({
-            project: projectId,
-            archived,
-        });
+        query
+            .where({
+                project: projectId,
+            })
+            .modify(FeatureToggleStore.filterByArchived, archived);
 
         const result = await query;
         return result.map((row) => ({
@@ -677,7 +678,8 @@ export default class FeatureToggleStore implements IFeatureToggleStore {
                                                   WHERE feature_types.id = features.type) *
                                                  INTERVAL '1 day'))) as current_staleness
              FROM features
-             WHERE NOT stale = true AND archived_at IS NULL`,
+             WHERE NOT stale = true
+               AND archived_at IS NULL`,
             [currentTime || this.db.fn.now()],
         );
 

diff --git a/src/test/e2e/services/project-service.e2e.test.ts b/src/test/e2e/services/project-service.e2e.test.ts
@@ -2070,19 +2070,15 @@ test('should get correct amount of features archived in current and past window'
     await Promise.all([
         updateFeature(toggles[0].name, {
             archived_at: new Date(),
-            archived: true,
         }),
         updateFeature(toggles[1].name, {
             archived_at: new Date(),
-            archived: true,
         }),
         updateFeature(toggles[2].name, {
             archived_at: subDays(new Date(), 31),
-            archived: true,
         }),
         updateFeature(toggles[3].name, {
             archived_at: subDays(new Date(), 31),
-            archived: true,
         }),
     ]);