more fixes

o19s · Jan 30, 2024 · 366678a · 366678a
1 parent da5597e
commit 366678a
Show file tree

Hide file tree

Showing 7 changed files with 27 additions and 25 deletions.
diff --git a/app/assets/javascripts/components/export_case/export_case_modal_instance_controller.js b/app/assets/javascripts/components/export_case/export_case_modal_instance_controller.js
@@ -12,7 +12,6 @@ angular.module('QuepidApp')
 
       ctrl.theCase = theCase;
       ctrl.supportsDetailedExport = supportsDetailedExport;
-      ctrl.isProcessingFile = isProcessingFile;
 
       // If called from the cases listing page, then we need the call back with the bootstrap,
       // otherwise on the main page the querySnapshotSvc.snapshots was bootstrapped.
@@ -50,7 +49,7 @@ angular.module('QuepidApp')
       };
 
 
-      function isProcessingFile() {
+      ctrl.isProcessingFile = function () {
         if (ctrl.options.snapshot){
           var desiredSnapshot = null;
           angular.forEach(ctrl.snapshots, function(snapshot) {
@@ -67,6 +66,6 @@ angular.module('QuepidApp')
           }
         }
         return false;
-      }
+      };
     }
   ]);
diff --git a/app/assets/javascripts/services/querySnapshotSvc.js b/app/assets/javascripts/services/querySnapshotSvc.js
@@ -141,8 +141,11 @@ angular.module('QuepidApp')
         };
 
         return $http.post('api/cases/' + caseNo + '/snapshots', saved)
-          .then(function() {
-              version++;
+          .then(function(response) {
+            return addSnapshotResp([response.data])
+              .then(function() {
+                version++;
+              });
           });
       };
 

diff --git a/app/controllers/api/v1/books_controller.rb b/app/controllers/api/v1/books_controller.rb
@@ -43,25 +43,30 @@ def show
 
             # Only return rateable judgements, filter out the unrateable ones.
             # unique_raters = @book.judgements.rateable.preload(:user).collect(&:user).uniq
-            unique_raters = @book.judges.merge(Judgement.rateable)
+            #unique_raters = @book.judges.merge(Judgement.rateable)
+            unique_judge_ids = @book.query_doc_pairs.joins(:judgements)
+              .distinct.pluck(:user_id)
+
 
-            puts 'HERE COME THE RATERS'
-            pp unique_raters
 
             # this logic about using email versus name is kind of awful.  Think about user.full_name or user.identifier?
-            unique_raters.each do |rater|
-              csv_headers << make_csv_safe(if rater.nil?
-                                             'Unknown'
+            unique_judges = []
+            unique_judge_ids.each do |judge_id|
+              judge = User.find(judge_id) unless judge_id.nil?
+              unique_judges << judge
+              csv_headers << make_csv_safe(if judge.nil?
+                                             'anonymous'
                                            else
-                                             rater.name.presence || rater.email
+                                             judge.name.presence || judge.email
                                            end)
             end
 
             @csv_array << csv_headers
-            @book.query_doc_pairs.each do |qdp|
+            query_doc_pairs = @book.query_doc_pairs.include(:judgements)
+            query_doc_pairs.each do |qdp|
               row = [ make_csv_safe(qdp.query_text), qdp.doc_id ]
-              unique_raters.each do |rater|
-                judgement = qdp.judgements.detect { |j| j.user == rater }
+              unique_judges.each do |judge|
+                judgement = qdp.judgements.detect { |j| j.user == judge }
                 rating = judgement.nil? ? '' : judgement.rating
 
                 row.append rating

diff --git a/app/controllers/api/v1/snapshots_controller.rb b/app/controllers/api/v1/snapshots_controller.rb
@@ -61,10 +61,9 @@ def create
       # rubocop:enable Layout/LineLength
 
       def destroy
-        # SnapshotDoc.joins(snapshot_query: :snapshot)
-        #   .where(snapshot_queries: { snapshot: @snapshot })
-        #  .delete_all
-        @snapshot.snapshot_docs.delete_all
+        SnapshotDoc.joins(snapshot_query: :snapshot)
+           .where(snapshot_queries: { snapshot: @snapshot })
+          .delete_all
         @snapshot.snapshot_queries.delete_all
         @snapshot.destroy
         Analytics::Tracker.track_snapshot_deleted_event current_user, @snapshot

diff --git a/app/controllers/judgements_controller.rb b/app/controllers/judgements_controller.rb
@@ -8,7 +8,7 @@ def index
     bool = ActiveRecord::Type::Boolean.new
     @shallow = bool.deserialize(params[:shallow] || true )
 
-    @judgements = @book.judgements.includes([ :query_doc_pair, :user ])
+    @judgements = @book.judgements.includes([ :query_doc_pair, :user ]).order('query_doc_pair_id')
   end
 
   def show

diff --git a/app/models/book.rb b/app/models/book.rb
@@ -35,10 +35,6 @@ class Book < ApplicationRecord
   belongs_to :selection_strategy
   belongs_to :scorer
   has_many :query_doc_pairs, dependent: :destroy, autosave: true
-  has_many   :ordered_judgements, -> { order('query_doc_pair_id') },
-             through:    :query_doc_pairs,
-             dependent:  :destroy,
-             class_name: 'Judgement'
 
   has_many   :judgements,
              through:   :query_doc_pairs,

diff --git a/spec/javascripts/angular/services/querySnapshotSvc_spec.js b/spec/javascripts/angular/services/querySnapshotSvc_spec.js
@@ -149,7 +149,7 @@ describe('Service: querySnapshotSvc', function () {
     $httpBackend.verifyNoOutstandingExpectation();
   });
 
-  it('doesnt update version if same case', function() {
+  it('does not update version if same case', function() {
     var priorVersion = querySnapshotSvc.version();
     querySnapshotSvc.bootstrap(2);
     querySnapshotSvc.bootstrap(2);