Add timeframe filter for snippets

openSUSE · Feb 27, 2024 · fc09c1c · fc09c1c
1 parent 0f8e996
commit fc09c1c
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 10 deletions.
diff --git a/assets/vue/ClassifySnippets.vue b/assets/vue/ClassifySnippets.vue
@@ -57,14 +57,26 @@
             <label
               >Confidence:&nbsp;
               <select v-model="params.confidence" @change="refreshPage()" class="form-control cavil-pkg-confidence">
-                <option value="5">5% or less</option>
-                <option value="10">10% or less</option>
-                <option value="20">20% or less</option>
-                <option value="30">30% or less</option>
-                <option value="50">50% or less</option>
                 <option value="100">Any</option>
+                <option value="50">50% or less</option>
+                <option value="30">30% or less</option>
+                <option value="20">20% or less</option>
+                <option value="10">10% or less</option>
+                <option value="5">5% or less</option>
+              </select>
+            </label>
+          </div>
+          <div class="form-group mb-2 mr-sm-4">
+            <label
+              >Timeframe:&nbsp;
+              <select v-model="params.timeframe" @change="refreshPage()" class="form-control cavil-pkg-timeframe">
+                <option value="any">Any</option>
+                <option value="month">1 month</option>
+                <option value="week">1 week</option>
+                <option value="day">1 day</option>
+                <option value="hour">1 hour</option>
               </select>
-              </label>
+            </label>
           </div>
         </form>
       </div>
@@ -156,7 +168,8 @@ export default {
       isClassified: true,
       isApproved: false,
       isLegal: true,
-      notLegal: true
+      notLegal: true,
+      timeframe: 'any'
     });
 
     return {
@@ -236,7 +249,7 @@ export default {
       this.getSnippets();
     }
   },
-  watch: {...genParamWatchers('isClassified', 'isApproved', 'isLegal', 'notLegal', 'confidence')}
+  watch: {...genParamWatchers('isClassified', 'isApproved', 'isLegal', 'notLegal', 'confidence', 'timeframe')}
 };
 </script>
 

diff --git a/lib/Cavil/Controller/Snippet.pm b/lib/Cavil/Controller/Snippet.pm
@@ -31,13 +31,15 @@ sub meta ($self) {
   $v->optional('isLegal')->in('true', 'false');
   $v->optional('notLegal')->in('true', 'false');
   $v->optional('confidence')->num(0, 100);
+  $v->optional('timeframe')->in('any', 'month', 'week', 'day', 'hour');
   $v->optional('before')->num;
   return $self->reply->json_validation_error if $v->has_error;
   my $is_classified = $v->param('isClassified') // 'true';
   my $is_approved   = $v->param('isApproved')   // 'false';
   my $is_legal      = $v->param('isLegal')      // 'true';
   my $not_legal     = $v->param('notLegal')     // 'true';
   my $confidence    = $v->param('confidence')   // 100;
+  my $timeframe     = $v->param('timeframe')    // 'any';
   my $before        = $v->param('before')       // 0;
 
   my $unclassified = $self->snippets->unclassified(
@@ -47,7 +49,8 @@ sub meta ($self) {
       is_classified => $is_classified,
       is_approved   => $is_approved,
       is_legal      => $is_legal,
-      not_legal     => $not_legal
+      not_legal     => $not_legal,
+      timeframe     => $timeframe
     }
   );
 

diff --git a/lib/Cavil/Model/Snippets.pm b/lib/Cavil/Model/Snippets.pm
@@ -64,6 +64,12 @@ sub unclassified ($self, $options) {
     $confidence = "AND confidence <= " . $options->{confidence};
   }
 
+  my $timeframe = '';
+  if ($options->{timeframe} ne 'any') {
+    my $interval = "1 $options->{timeframe}";
+    $timeframe = "AND created > NOW() - INTERVAL '$interval'";
+  }
+
   my $is_approved   = 'approved = ' . uc($options->{is_approved});
   my $is_classified = 'classified = ' . uc($options->{is_classified});
 
@@ -77,7 +83,7 @@ sub unclassified ($self, $options) {
 
   my $snippets = $db->query(
     "SELECT *, COUNT(*) OVER() AS total FROM snippets
-     WHERE $is_approved AND $is_classified $before $legal $confidence ORDER BY id DESC LIMIT 10"
+     WHERE $is_approved AND $is_classified $before $legal $confidence $timeframe ORDER BY id DESC LIMIT 10"
   )->hashes;
 
   my $total = 0;