Merge branch 'classification_user_groups-migrations-and-models' into …

…classification-user-groups-counts
zooniverse · Aug 1, 2023 · efcd30a · efcd30a
2 parents 6730cfa + 8c5300c
commit efcd30a
Show file tree

Hide file tree

Showing 13 changed files with 21 additions and 202 deletions.
diff --git a/app/controllers/user_group_classification_count_controller.rb b/app/controllers/user_group_classification_count_controller.rb
diff --git a/app/queries/concerns/filterable.rb b/app/queries/concerns/filterable.rb
@@ -29,12 +29,6 @@ def filter_by_user_id(scoped, user_id)
     scoped.where(user_id: user_ids)
   end
 
-  def filter_by_user_group_id(scoped, user_group_id)
-    return scoped unless user_group_id.present?
-
-    scoped.where(user_group_id: user_group_id)
-  end
-
   private
 
   def range_clause(start_date, end_date)

diff --git a/app/queries/count_group_active_user_classifications.rb b/app/queries/count_group_active_user_classifications.rb
diff --git a/app/queries/count_group_classifications.rb b/app/queries/count_group_classifications.rb
diff --git a/app/queries/count_group_project_contributions.rb b/app/queries/count_group_project_contributions.rb
diff --git a/app/serializers/user_group_classification_counts_serializer.rb b/app/serializers/user_group_classification_counts_serializer.rb
diff --git a/config/routes.rb b/config/routes.rb
@@ -7,6 +7,6 @@
 
   get '/comments', action: :query, controller: 'comment_count'
   get '/classifications/users/:id', action: :query, controller: 'user_classification_count', constraints: { id: /\d+/ }
-  get '/classifications/user_groups/:id', action: :query, controller: 'user_group_classification_count', constraints: { id: /\d+/ }
   get '/classifications', action: :query, controller: 'classification_count'
+  # get '/classifications/user_groups/:id, action: :query_by_user_group, controller: 'user_group_classification_count'
 end
diff --git a/db/migrate/20230725185947_create_daily_group_classifications_count_and_time.rb b/db/migrate/20230725185947_create_daily_group_classifications_count_and_time.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class CreateDailyGroupClassificationsCountAndTime < ActiveRecord::Migration[7.0]
   # we have to disable the migration transaction because creating materialized views within it is not allowed.
   disable_ddl_transaction!

diff --git a/db/migrate/20230725193600_create_daily_group_project_classification_count_and_time.rb b/db/migrate/20230725193600_create_daily_group_project_classification_count_and_time.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class CreateDailyGroupProjectClassificationCountAndTime < ActiveRecord::Migration[7.0]
   # we have to disable the migration transaction because creating materialized views within it is not allowed.
   disable_ddl_transaction!

diff --git a/db/migrate/20230725194157_create_daily_group_workflow_classification_count_and_time.rb b/db/migrate/20230725194157_create_daily_group_workflow_classification_count_and_time.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class CreateDailyGroupWorkflowClassificationCountAndTime < ActiveRecord::Migration[7.0]
   # we have to disable the migration transaction because creating materialized views within it is not allowed.
   disable_ddl_transaction!

diff --git a/db/migrate/20230725194325_create_daily_group_user_classification_count_and_time.rb b/db/migrate/20230725194325_create_daily_group_user_classification_count_and_time.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class CreateDailyGroupUserClassificationCountAndTime < ActiveRecord::Migration[7.0]
   # we have to disable the migration transaction because creating materialized views within it is not allowed.
   disable_ddl_transaction!
@@ -6,7 +8,8 @@ class CreateDailyGroupUserClassificationCountAndTime < ActiveRecord::Migration[7
   ## Even though the view are very similar we cannot query from just daily_user_classification_count_and_time to get stats info of that user for that group.
   ## Reason being:
   ## A) daily_user_classification_count_and_time does not consider when a user has joined a group.
-  ## (So if we queried for all time for the user group, the user's old classifications [when he/she/they were not part of the group] would be counted towards the user group) [Vice versa if a user LEAVES a user group]
+  ## (So if we queried for all time for the user group, the user's old classifications [when he/she/they were not part of the group] would be counted towards the user group)
+  ## [Vice versa if a user LEAVES a user group]
   ## B) On the flip side, we cannot query from just daily_group_classification_count_and_time_per_user, because not every user belongs to a group.
   def change
     execute <<~SQL

diff --git a/db/migrate/20230801163815_create_daily_group_user_project_count_and_time.rb b/db/migrate/20230801163815_create_daily_group_user_project_count_and_time.rb
@@ -3,12 +3,14 @@
 class CreateDailyGroupUserProjectCountAndTime < ActiveRecord::Migration[7.0]
   # we have to disable the migration transaction because creating materialized views within it is not allowed.
   disable_ddl_transaction!
-  ## We should note that this view looks very similar to the daily_user_classification_count_and_time_per_project (where the columns of that table are day, user_id, classification_count, total_session_time, project_id).
+  ## We should note that this view looks very similar to the daily_user_classification_count_and_time_per_project
+  ## (where the columns of that table are day, user_id, classification_count, total_session_time, project_id).
   ## The only difference between this view and daily_user_classification_count_and_time_per_project is that we are grouping by user_group_id (i.e. user_group_id is a column in this view).
   ## Even though the views are very similar we cannot query from just daily_user_classification_count_and_time_per_project to get stats info of that user for that group.
   ## Reason being:
   ## A) daily_user_classification_count_and_time_per_project does not consider WHEN a user has joined a group.
-  ## (So if we queried for all time for the user group, the user's old classifications [when he/she/they were not part of the group] would be counted towards the user group) [Vice versa if a user LEAVES a user group]
+  ## (So if we queried for all time for the user group, the user's old classifications [when he/she/they were not part of the group] would be counted towards the user group)
+  ## [Vice versa if a user LEAVES a user group]
   ## B) On the flip side, we cannot query from just daily_group_classification_count_and_time_per_user_per_prject when querying for just user stats, because not every user belongs to a group.
   def change
     execute <<~SQL

diff --git a/db/migrate/20230801163827_create_daily_group_user_workflow_count_and_time.rb b/db/migrate/20230801163827_create_daily_group_user_workflow_count_and_time.rb
@@ -1,12 +1,16 @@
+# frozen_string_literal: true
+
 class CreateDailyGroupUserWorkflowCountAndTime < ActiveRecord::Migration[7.0]
   # we have to disable the migration transaction because creating materialized views within it is not allowed.
   disable_ddl_transaction!
-  ## We should note that this view looks very similar to the daily_user_classification_count_and_time_per_workflow (where the columns of that table are day, user_id, classification_count, total_session_time, workflow_id).
+  ## We should note that this view looks very similar to the daily_user_classification_count_and_time_per_workflow
+  ## (where the columns of that table are day, user_id, classification_count, total_session_time, workflow_id).
   ## The only difference between this view and daily_user_classification_count_and_time_per_workflow is that we are grouping by user_group_id (i.e. user_group_id is a column in this view).
   ## Even though the views are very similar we cannot query from just daily_user_classification_count_and_time_per_workflow to get stats info of that user for that group.
   ## Reason being:
   ## A) daily_user_classification_count_and_time_per_workflow does not consider WHEN a user has joined a group.
-  ## (So if we queried for all time for the user group, the user's old classifications [when he/she/they were not part of the group] would be counted towards the user group) [Vice versa if a user LEAVES a user group]
+  ## (So if we queried for all time for the user group, the user's old classifications [when he/she/they were not part of the group] would be counted towards the user group)
+  ## [Vice versa if a user LEAVES a user group]
   ## B) On the flip side, we cannot query from just daily_group_classification_count_and_time_per_user_per_workflow when querying for just user stats, because not every user belongs to a group.
   def change
     execute <<~SQL