remove explicit project column from notifications

app/contracts/notifications/create_contract.rb

@@ -31,7 +31,6 @@ class CreateContract < ::ModelContract
     attribute :recipient
     attribute :subject
     attribute :reason
-    attribute :project
     attribute :actor
     attribute :resource
     attribute :journal

app/models/notification.rb

@@ -48,7 +48,6 @@ class Notification < ApplicationRecord
 
   belongs_to :recipient, class_name: "User"
   belongs_to :actor, class_name: "User"
-  belongs_to :project
   belongs_to :journal
   belongs_to :resource, polymorphic: true
 

app/models/queries/notifications/filters/project_filter.rb

@@ -28,4 +28,15 @@
 
 class Queries::Notifications::Filters::ProjectFilter < Queries::Notifications::Filters::NotificationFilter
   include Queries::Filters::Shared::ProjectFilter::Optional
+
+  # This is currently work package specific same as all the other parts of the NotificationQuery
+  self.model = WorkPackage
+
+  def joins
+    <<~SQL.squish
+      JOIN #{WorkPackage.table_name}
+      ON #{WorkPackage.table_name}.id = #{Notification.table_name}.resource_id
+      AND #{Notification.table_name}.resource_type = 'WorkPackage'
+    SQL
+  end
 end

app/models/queries/notifications/group_bys/group_by_project.rb

@@ -33,6 +33,16 @@ def self.key
     :project
   end
 
+  def joins
+    # Only Notifications for work_packages are currently supported via the query.
+    # E.g. the visible statement used in the query is WorkPackage specific.
+    <<~SQL.squish
+      JOIN work_packages
+      ON notifications.resource_id = work_packages.id
+      AND notifications.resource_type = 'WorkPackage'
+    SQL
+  end
+
   def name
     :project_id
   end

app/models/queries/notifications/orders/project_order.rb

@@ -34,15 +34,23 @@ def self.key
   end
 
   def joins
-    :project
+    <<~SQL.squish
+      JOIN #{WorkPackage.table_name} work_packages_order
+      ON work_packages_order.id = #{Notification.table_name}.resource_id
+      AND #{Notification.table_name}.resource_type = 'WorkPackage'
+      JOIN #{Project.table_name}
+      ON #{Project.table_name}.id = work_packages_order.project_id
+    SQL
   end
 
   protected
 
   def order(scope)
-    order_string = "projects.name"
-    order_string += " DESC" if direction == :desc
+    with_raise_on_invalid do
+      order_string = "#{Project.table_name}.name"
+      order_string += " DESC" if direction == :desc
 
-    scope.order(order_string)
+      scope.order(order_string)
+    end
   end
 end

app/services/notifications/create_from_model_service.rb

@@ -106,7 +106,6 @@ def update_or_create_notification(recipient_id, reason)
   def create_notification(recipient_id, reason)
     notification_attributes = {
       recipient_id:,
-      project:,
       resource:,
       journal:,
       actor: user_with_fallback,

app/services/notifications/set_attributes_service.rb

@@ -27,20 +27,5 @@
 #++
 
 module Notifications
-  class SetAttributesService < ::BaseServices::SetAttributes
-    private
-
-    def set_default_attributes(params)
-      super
-
-      set_default_project unless model.project
-    end
-
-    ##
-    # Try to determine the project context from the journal (if any)
-    # or the resource if it has a project set
-    def set_default_project
-      model.project = model.journal&.project || model.resource.try(:project)
-    end
-  end
+  class SetAttributesService < ::BaseServices::SetAttributes; end
 end

app/workers/notifications/create_date_alerts_notifications_job/service.rb

@@ -70,7 +70,6 @@ def create_date_alert_notification(user, work_package, reason)
     create_service = Notifications::CreateService.new(user:)
     create_service.call(
       recipient_id: user.id,
-      project_id: work_package.project_id,
       resource: work_package,
       reason:
     )

db/migrate/20240820123011_remove_project_from_notification.rb

@@ -0,0 +1,33 @@
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+#++
+
+class RemoveProjectFromNotification < ActiveRecord::Migration[7.1]
+  def change
+    remove_reference :notifications, :project
+  end
+end

lib/api/v3/notifications/notification_eager_loading_wrapper.rb

@@ -44,7 +44,10 @@ def wrap(notifications)
           # because it is a polymorphic association. That being as it is, currently only
           # work packages are assigned.
           def set_resource(notifications)
-            work_packages_by_id = WorkPackage.where(id: notifications.pluck(:resource_id).uniq).index_by(&:id)
+            work_packages_by_id = WorkPackage
+                                    .includes(:project)
+                                    .where(id: notifications.pluck(:resource_id).uniq)
+                                    .index_by(&:id)
 
             notifications.each do |notification|
               notification.resource = work_packages_by_id[notification.resource_id]

lib/api/v3/notifications/notification_representer.rb

@@ -72,13 +72,18 @@ class NotificationRepresenter < ::API::Decorators::Single
           }
         end
 
+        link :project do
+          {
+            href: api_v3_paths.project(represented.resource.project.id),
+            name: represented.resource.project.name
+          }
+        end
+
         associated_resource :actor,
                             representer: ::API::V3::Users::UserRepresenter,
                             skip_render: ->(*) { represented.actor.nil? },
                             v3_path: :user
 
-        associated_resource :project
-
         associated_resource :journal,
                             as: :activity,
                             representer: ::API::V3::Activities::ActivityRepresenter,
@@ -87,11 +92,26 @@ class NotificationRepresenter < ::API::Decorators::Single
 
         polymorphic_resource :resource
 
+        resource :project,
+                 getter: ->(*) {
+                           ::API::V3::Projects::ProjectRepresenter
+                             .create(represented.resource.project, current_user:, embed_links:)
+                         },
+                 link: ->(*) {
+                         {
+                           href: api_v3_paths.project(represented.resource.project.id),
+                           title: represented.resource.project.name
+                         }
+                       },
+                 setter: ->(*) {
+                           raise NotImplementedError
+                         }
+
         def _type
           "Notification"
         end
 
-        self.to_eager_load = %i[project actor journal]
+        self.to_eager_load = %i[actor journal]
       end
     end
   end

spec/contracts/notifications/create_contract_spec.rb

@@ -37,7 +37,6 @@
     end
   end
 
-  let(:notification_context) { build_stubbed(:project) }
   let(:notification_resource) { build_stubbed(:journal) }
   let(:notification_recipient) { build_stubbed(:user) }
   let(:notification_subject) { "Some text" }
@@ -46,8 +45,7 @@
   let(:notification_mail_reminder_sent) { false }
 
   let(:notification) do
-    Notification.new(project: notification_context,
-                     recipient: notification_recipient,
+    Notification.new(recipient: notification_recipient,
                      subject: notification_subject,
                      reason: notification_reason,
                      resource: notification_resource,

spec/factories/notification_factory.rb

@@ -6,11 +6,10 @@
     mail_alert_sent { false }
     reason { :mentioned }
     recipient factory: :user
-    project
-    resource { association :work_package, project: }
+    resource { association :work_package }
 
     trait :for_milestone do
-      resource { association :work_package, :is_milestone, project: }
+      resource { association :work_package, :is_milestone }
     end
     # journal and actor are not listed by intend.
     # They will be set in the after_build callback.

spec/features/notifications/navigation_spec.rb

@@ -12,15 +12,13 @@
   shared_let(:notification) do
     create(:notification,
            recipient:,
-           project:,
            resource: work_package,
            journal: work_package.journals.last)
   end
 
   shared_let(:second_notification) do
     create(:notification,
            recipient:,
-           project:,
            resource: second_work_package,
            journal: second_work_package.journals.last)
   end

spec/features/notifications/notification_center/notification_center_date_alert_mention_spec.rb

@@ -18,16 +18,14 @@
            reason: :mentioned,
            recipient: user,
            resource: work_package,
-           actor:,
-           project:)
+           actor:)
   end
 
   shared_let(:notification_date_alert) do
     create(:notification,
            reason: :date_alert_due_date,
            recipient: user,
-           resource: work_package,
-           project:)
+           resource: work_package)
   end
 
   let(:center) { Pages::Notifications::Center.new }

spec/features/notifications/notification_center/notification_center_date_alerts_spec.rb

@@ -90,16 +90,14 @@ def create_alertable(**attributes)
     create(:notification,
            reason: :date_alert_due_date,
            recipient: user,
-           resource: milestone_wp_future,
-           project:)
+           resource: milestone_wp_future)
   end
 
   shared_let(:notification_wp_start_past) do
     create(:notification,
            reason: :date_alert_start_date,
            recipient: user,
-           resource: wp_start_past,
-           project:)
+           resource: wp_start_past)
   end
 
   # notification created by CreateDateAlertsNotificationsJob
@@ -121,30 +119,26 @@ def create_alertable(**attributes)
     create(:notification,
            reason: :date_alert_due_date,
            recipient: user,
-           resource: wp_double_notification,
-           project:)
+           resource: wp_double_notification)
   end
 
   shared_let(:notification_wp_double_mention) do
     create(:notification,
            reason: :mentioned,
            recipient: user,
-           resource: wp_double_notification,
-           project:)
+           resource: wp_double_notification)
   end
 
   shared_let(:notification_wp_double_alerts) do
     due = create(:notification,
                  reason: :date_alert_due_date,
                  recipient: user,
-                 resource: wp_double_alert,
-                 project:)
+                 resource: wp_double_alert)
 
     start = create(:notification,
                    reason: :date_alert_start_date,
                    recipient: user,
-                   resource: wp_double_alert,
-                   project:)
+                   resource: wp_double_alert)
 
     [start, due]
   end
@@ -153,16 +147,14 @@ def create_alertable(**attributes)
     create(:notification,
            reason: :date_alert_due_date,
            recipient: user,
-           resource: wp_unset_date,
-           project:)
+           resource: wp_unset_date)
   end
 
   shared_let(:notification_wp_due_today) do
     create(:notification,
            reason: :date_alert_due_date,
            recipient: user,
-           resource: wp_due_today,
-           project:)
+           resource: wp_due_today)
   end
 
   let(:center) { Pages::Notifications::Center.new }

spec/features/notifications/notification_center/notification_center_sidemenu_spec.rb

@@ -28,47 +28,41 @@
   let(:notification_watched) do
     create(:notification,
            recipient:,
-           project:,
            resource: work_package,
            reason: :watched)
   end
 
   let(:notification_assigned) do
     create(:notification,
            recipient:,
-           project: project2,
            resource: work_package2,
            reason: :assigned)
   end
 
   let(:notification_responsible) do
     create(:notification,
            recipient:,
-           project: project3,
            resource: work_package3,
            reason: :responsible)
   end
 
   let(:notification_mentioned) do
     create(:notification,
            recipient:,
-           project: project3,
            resource: work_package4,
            reason: :mentioned)
   end
 
   let(:notification_date) do
     create(:notification,
            recipient:,
-           project: project3,
            resource: work_package5,
            reason: :date_alert_start_date)
   end
 
   let(:notification_shared) do
     create(:notification,
            recipient:,
-           project: project3,
            resource: work_package6,
            reason: :shared)
   end