Skip to content

Self-hosted project management for devs and their clients: tickets, time tracking, docs and meetings, with an AI assistant that cites its sources. AGPL-3.0.

Move a meeting with its booked time into another project

Guido Boyke0a5fb68214de
diff --git a/app/components/concerns/project_activity_row.rb b/app/components/concerns/project_activity_row.rb
index ba44295..aff6803 100644
--- a/app/components/concerns/project_activity_row.rb
+++ b/app/components/concerns/project_activity_row.rb
@@ -62,7 +62,7 @@ module ProjectActivityRow
params['note_title']
when 'chat_created'
params['chat_title']
- when 'meeting_created', 'meeting_deleted'
+ when 'meeting_created', 'meeting_deleted', 'meeting_moved_in', 'meeting_moved_out'
params['meeting_title']
when 'smart_folder_created'
params['folder_name']
diff --git a/app/components/neo_activity_filter_component.rb b/app/components/neo_activity_filter_component.rb
index 12657cb..b319c41 100644
--- a/app/components/neo_activity_filter_component.rb
+++ b/app/components/neo_activity_filter_component.rb
@@ -21,6 +21,7 @@ class NeoActivityFilterComponent < ViewComponent::Base
'tickets' => %w[created updated deleted status_changed priority_changed title_changed description_changed
assigned unassigned post_added moved ticket_created ticket_moved_in ticket_moved_out],
'knowledge' => %w[document_created note_created chat_created meeting_created meeting_deleted
+ meeting_moved_in meeting_moved_out
smart_folder_created codebase_imported],
'times' => %w[created started stopped paused resumed],
'administration' => %w[member_added member_removed permission_changed role_changed updated]
diff --git a/app/controllers/organisations/projects/activities_controller.rb b/app/controllers/organisations/projects/activities_controller.rb
index 1371bb3..3819524 100644
--- a/app/controllers/organisations/projects/activities_controller.rb
+++ b/app/controllers/organisations/projects/activities_controller.rb
@@ -7,7 +7,7 @@ class Organisations::Projects::ActivitiesController < Organisations::BaseControl
# Meeting activities are tracked on the project (trackable_type = 'Project')
# and distinguished only by their action, so the "Meeting" object-type filter
# matches on action instead of trackable_type.
- MEETING_ACTIONS = %w[meeting_created meeting_deleted].freeze
+ MEETING_ACTIONS = %w[meeting_created meeting_deleted meeting_moved_in meeting_moved_out].freeze
KNOWLEDGE_AREAS = %i[notes documents meetings chats documentation].freeze
ADMINISTRATION_AREAS = %i[members project].freeze
TICKET_KEYS = (Activities::AreaRegistry.keys_by_area.fetch(:tickets, []) - ['project.smart_folder_created']).freeze
diff --git a/app/helpers/timeline_helper.rb b/app/helpers/timeline_helper.rb
index dff4167..2e681a3 100644
--- a/app/helpers/timeline_helper.rb
+++ b/app/helpers/timeline_helper.rb
@@ -161,6 +161,10 @@ module TimelineHelper
t('views.organisations.tickets.timeline.meeting_created')
when 'meeting_deleted'
t('views.organisations.tickets.timeline.meeting_deleted')
+ when 'meeting_moved_in'
+ t('views.organisations.tickets.timeline.meeting_moved_in', project: activity.parameters&.dig('from_project_name'))
+ when 'meeting_moved_out'
+ t('views.organisations.tickets.timeline.meeting_moved_out', project: activity.parameters&.dig('to_project_name'))
when 'smart_folder_created'
t('views.organisations.tickets.timeline.smart_folder_created')
when 'codebase_imported'
diff --git a/app/models/concerns/project_trackable.rb b/app/models/concerns/project_trackable.rb
index 0cdda98..eef643d 100644
--- a/app/models/concerns/project_trackable.rb
+++ b/app/models/concerns/project_trackable.rb
@@ -186,6 +186,30 @@ module ProjectTrackable
)
end
+ def track_meeting_moved_in(meeting, from_project)
+ create_activity(
+ action: 'meeting_moved_in',
+ secondary: meeting,
+ parameters: {
+ meeting_title: meeting.title,
+ from_project_name: from_project&.name,
+ from_project_id: from_project&.id
+ }.compact
+ )
+ end
+
+ def track_meeting_moved_out(meeting, to_project)
+ create_activity(
+ action: 'meeting_moved_out',
+ secondary: meeting,
+ parameters: {
+ meeting_title: meeting.title,
+ to_project_name: to_project&.name,
+ to_project_id: to_project&.id
+ }.compact
+ )
+ end
+
# No `secondary:` — the meeting row is gone when this fires (after_destroy_commit);
# a polymorphic reference to a deleted record would dangle. Parameters carry the
# audit facts instead (transcripts are PII: deletions must leave a trace).
diff --git a/app/services/activities/area_registry.rb b/app/services/activities/area_registry.rb
index ae94654..219d038 100644
--- a/app/services/activities/area_registry.rb
+++ b/app/services/activities/area_registry.rb
@@ -75,6 +75,8 @@ module Activities
'project.document_created' => :documents,
'project.meeting_created' => :meetings,
'project.meeting_deleted' => :meetings,
+ 'project.meeting_moved_in' => :meetings,
+ 'project.meeting_moved_out' => :meetings,
'project.chat_created' => :chats,
'project.member_added' => :members,
'project.member_removed' => :members,
diff --git a/app/services/activities/project_target.rb b/app/services/activities/project_target.rb
index 10bb18e..e6273c5 100644
--- a/app/services/activities/project_target.rb
+++ b/app/services/activities/project_target.rb
@@ -8,7 +8,7 @@ module Activities
SECONDARY_ACTIONS = %w[
ticket_created ticket_moved_in ticket_moved_out
document_added document_created note_created chat_created
- meeting_created smart_folder_created
+ meeting_created meeting_moved_in smart_folder_created
].freeze
def self.call(activity)
diff --git a/app/services/actors/move_meeting.rb b/app/services/actors/move_meeting.rb
new file mode 100644
index 0000000..94c179b
--- /dev/null
+++ b/app/services/actors/move_meeting.rb
@@ -0,0 +1,94 @@
+# frozen_string_literal: true
+
+# Tier-1 actor: moves ONE meeting into another project of the same organisation
+# (doc/meeting_verschieben_plan.md). The booked time and the meeting's
+# notifications follow it, open AI ticket suggestions are dismissed (accepting
+# one after the move would be refused anyway, AcceptTicketSuggestion compares the
+# run's project), and both projects record the move.
+#
+# Refused, with a code: a meeting with linked tickets (the links point into the
+# source project and the link controller keeps them same-project; a tombstone
+# counts too), an active suggestion run (it carries the source project), the
+# project the meeting is in, and a target the user may not write meetings in.
+# The permission to move at all (move_meetings) is MeetingPolicy#move?, asked by
+# the controller; the target check is repeated here because the actor writes it.
+module Actors
+ class MoveMeeting < BaseActor
+ def initialize(meeting:, target_project:, current_user:)
+ super()
+ @meeting = meeting
+ @source_project = meeting.project
+ @target_project = target_project
+ @current_user = current_user
+ end
+
+ def record
+ @meeting
+ end
+
+ # What the move would take along or refuse on, without moving (the dialog).
+ def preflight
+ sessions = @meeting.time_sessions.where(deleted_at: nil)
+ {
+ time_sessions_count: sessions.count,
+ billed_time_sessions_count: sessions.where(billed: true).count,
+ open_suggestions_count: @meeting.meeting_ticket_suggestions.open.count,
+ ticket_links_count: ticket_links.count
+ }
+ end
+
+ def perform
+ guard_target!
+ # Row lock first, as AcceptTicketSuggestion does: a link or a run created
+ # concurrently waits for the move instead of slipping past the guards.
+ @meeting.lock!
+ guard_movable!
+
+ @meeting.update_columns(project_id: @target_project.id, updated_at: Time.current)
+ @meeting.time_sessions.update_all(project_id: @target_project.id)
+ # The inbox rule reads a notification's project (see Tickets::Mover): left
+ # behind, a row stays readable for whoever reads meetings in the source.
+ Notification.where(notifiable: @meeting).update_all(project_id: @target_project.id)
+ @meeting.meeting_ticket_suggestions.open
+ .update_all(status: MeetingTicketSuggestion.statuses[:dismissed], updated_at: Time.current)
+
+ @source_project.track_meeting_moved_out(@meeting, @target_project)
+ @target_project.track_meeting_moved_in(@meeting, @source_project)
+ @meeting.reload
+ end
+
+ private
+
+ # The archive check is explicit: the area check lets account admins write
+ # into an archived project (the admin short-circuit in ProjectAccessService
+ # comes before its archive rule), and nobody moves a meeting into one.
+ def guard_target!
+ refuse!(:same_project) if @target_project.id == @source_project.id
+ return if @target_project.organisation_id == @meeting.organisation_id &&
+ !@target_project.archived? &&
+ ProjectPolicy.new(@current_user, @target_project).area_access?(:meetings, :write)
+
+ refuse!(:forbidden_target)
+ end
+
+ def guard_movable!
+ refuse!(:has_ticket_links) if ticket_links.exists?
+ refuse!(:suggestion_run_active) if suggestion_run_active?
+ end
+
+ def ticket_links
+ @meeting.outgoing_references.where(target_type: 'Ticket')
+ end
+
+ # A run that lost its job releases the move after the same staleness window
+ # that releases the button (Meeting::SUGGESTIONS_STALE_AFTER).
+ def suggestion_run_active?
+ @meeting.suggestions_generation_running? ||
+ MeetingTicketSuggestionRun.where(meeting_id: @meeting.id).any? { |run| run.active? && !run.stale? }
+ end
+
+ def refuse!(code)
+ raise ActorError.new(I18n.t("services.actors.move_meeting.#{code}"), code: code)
+ end
+ end
+end
diff --git a/config/locales/activities.de.yml b/config/locales/activities.de.yml
index ed61f31..492eea8 100644
--- a/config/locales/activities.de.yml
+++ b/config/locales/activities.de.yml
@@ -29,6 +29,8 @@ de:
tickets_bulk_deleted: "%{actor} hat %{count} Tickets gelöscht: %{numbers}"
meeting_created: "Meeting \"%{meeting_title}\" erstellt (%{actor})"
meeting_deleted: "Meeting \"%{meeting_title}\" gelöscht (%{actor})"
+ meeting_moved_in: "Meeting \"%{meeting_title}\" aus „%{from_project_name}“ hierher verschoben (%{actor})"
+ meeting_moved_out: "Meeting \"%{meeting_title}\" nach „%{to_project_name}“ verschoben (%{actor})"
# KI-Paket-Wahl (trackable = Organisation, KI-Pakete P4e / E4). Zwei Verben für
# die zwei Achsen aus §2: nur der Paketwechsel trägt eine Rechtsraum-Entscheidung,
# der Stufenwechsel nicht. Ein Protokoll, das beides gleich benennt, wäre
diff --git a/config/locales/activities.en.yml b/config/locales/activities.en.yml
index fd45d9f..62b640e 100644
--- a/config/locales/activities.en.yml
+++ b/config/locales/activities.en.yml
@@ -29,6 +29,8 @@ en:
tickets_bulk_deleted: "%{actor} deleted %{count} tickets: %{numbers}"
meeting_created: "Meeting \"%{meeting_title}\" created (%{actor})"
meeting_deleted: "Meeting \"%{meeting_title}\" deleted (%{actor})"
+ meeting_moved_in: "Meeting \"%{meeting_title}\" moved here from “%{from_project_name}” (%{actor})"
+ meeting_moved_out: "Meeting \"%{meeting_title}\" moved to “%{to_project_name}” (%{actor})"
# AI package choice (trackable = Organisation, KI-Pakete P4e / E4). Two verbs
# for the two axes of §2: only the package switch carries a jurisdiction
# decision, the tier switch does not. A log naming both the same would be
diff --git a/config/locales/services.de.yml b/config/locales/services.de.yml
index bc05c20..cd9b8b3 100644
--- a/config/locales/services.de.yml
+++ b/config/locales/services.de.yml
@@ -47,6 +47,11 @@ de:
ticket_missing: "Eines der beiden Tickets gibt es nicht mehr."
destroy_ticket_relation:
not_found: "Die Beziehung wurde nicht gefunden."
+ move_meeting:
+ same_project: "Das Meeting liegt schon in diesem Projekt."
+ forbidden_target: "In diesem Projekt darfst du keine Meetings anlegen."
+ has_ticket_links: "Das Meeting ist mit Tickets verknüpft. Entferne die Verknüpfungen, dann kannst du es verschieben."
+ suggestion_run_active: "Für das Meeting werden gerade Ticket-Vorschläge erzeugt. Versuche es gleich noch einmal."
move_ticket:
number_conflict: "Nummernkonflikt nach %{retries} Versuchen: %{error}"
has_hierarchy: "Tickets mit Unteraufgaben oder einem übergeordneten Ticket können nicht verschoben werden."
diff --git a/config/locales/services.en.yml b/config/locales/services.en.yml
index 3ed5757..3750c04 100644
--- a/config/locales/services.en.yml
+++ b/config/locales/services.en.yml
@@ -47,6 +47,11 @@ en:
ticket_missing: "One of the two tickets no longer exists."
destroy_ticket_relation:
not_found: "The relation was not found."
+ move_meeting:
+ same_project: "The meeting is already in this project."
+ forbidden_target: "You may not add meetings to this project."
+ has_ticket_links: "The meeting is linked to tickets. Remove the links, then you can move it."
+ suggestion_run_active: "Ticket suggestions are being generated for this meeting. Try again in a moment."
move_ticket:
number_conflict: "Number conflict after %{retries} retries: %{error}"
has_hierarchy: "Tickets with sub-tasks or a parent ticket cannot be moved."
diff --git a/config/locales/views/tickets.de.yml b/config/locales/views/tickets.de.yml
index 3d0e441..17f31e0 100644
--- a/config/locales/views/tickets.de.yml
+++ b/config/locales/views/tickets.de.yml
@@ -458,6 +458,8 @@ de:
chat_created: Chat erstellt
meeting_created: Meeting erstellt
meeting_deleted: Meeting gelöscht
+ meeting_moved_in: "Meeting aus „%{project}“ hierher verschoben"
+ meeting_moved_out: "Meeting nach „%{project}“ verschoben"
smart_folder_created: Smart Folder erstellt
codebase_imported: Codebase importiert
member_added: "Mitglied hinzugefügt: %{name}"
diff --git a/config/locales/views/tickets.en.yml b/config/locales/views/tickets.en.yml
index 46452c1..2469859 100644
--- a/config/locales/views/tickets.en.yml
+++ b/config/locales/views/tickets.en.yml
@@ -458,6 +458,8 @@ en:
chat_created: Chat created
meeting_created: Meeting created
meeting_deleted: Meeting deleted
+ meeting_moved_in: "Meeting moved here from “%{project}”"
+ meeting_moved_out: "Meeting moved to “%{project}”"
smart_folder_created: Smart folder created
codebase_imported: Codebase imported
member_added: "Member added: %{name}"
diff --git a/spec/architecture/notification_read_guard_spec.rb b/spec/architecture/notification_read_guard_spec.rb
index 0e44251..b2ffdd1 100644
--- a/spec/architecture/notification_read_guard_spec.rb
+++ b/spec/architecture/notification_read_guard_spec.rb
@@ -65,6 +65,7 @@ module NotificationReadGuard
'app/services/notifications/mark_ticket_read.rb' => [3, 'writes: marks the rows of an opened ticket read'],
'app/services/posts/mark_read.rb' => [1, 'writes: marks the rows of a read comment read'],
'app/services/tickets/mover.rb' => [1, 'writes: moves the notifications of a moved ticket along'],
+ 'app/services/actors/move_meeting.rb' => [1, 'writes: moves the notifications of a moved meeting along'],
'app/services/posts/excerpt_redaction.rb' => [1, 'writes: redacts excerpts of a deleted or private comment'],
'app/services/notifications/unread_signals.rb' =>
[1, 'a grouped pre-count that only decides WHERE to ask; each count shown is inbox_unread'],
diff --git a/spec/services/activities/area_registry_spec.rb b/spec/services/activities/area_registry_spec.rb
index e315ecf..d75caaf 100644
--- a/spec/services/activities/area_registry_spec.rb
+++ b/spec/services/activities/area_registry_spec.rb
@@ -51,6 +51,8 @@ RSpec.describe Activities::AreaRegistry do
expect(described_class.area_for('project.note_created')).to eq(:notes)
expect(described_class.area_for('project.document_created')).to eq(:documents)
expect(described_class.area_for('project.meeting_created')).to eq(:meetings)
+ expect(described_class.area_for('project.meeting_moved_in')).to eq(:meetings)
+ expect(described_class.area_for('project.meeting_moved_out')).to eq(:meetings)
expect(described_class.area_for('project.member_added')).to eq(:members)
expect(described_class.area_for('project.ticket_created')).to eq(:tickets)
end
diff --git a/spec/services/actors/move_meeting_spec.rb b/spec/services/actors/move_meeting_spec.rb
new file mode 100644
index 0000000..f2f8de8
--- /dev/null
+++ b/spec/services/actors/move_meeting_spec.rb
@@ -0,0 +1,150 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe Actors::MoveMeeting, type: :service do
+ let(:organisation) { create(:organisation) }
+ let(:admin_role) { create(:admin_role, organisation: organisation) }
+ let(:standard_role) { create(:role, organisation: organisation, title: 'Standard User') }
+ let(:admin) { create(:user) }
+ let(:member) { create(:user) }
+ let(:source_project) { create(:project, organisation: organisation) }
+ let(:target_project) { create(:project, organisation: organisation) }
+
+ before do
+ ActsAsTenant.current_tenant = organisation
+ create(:membership, user: admin, organisation: organisation, role: admin_role)
+ create(:membership, user: member, organisation: organisation, role: standard_role)
+ end
+
+ # After the before block: the tenant has to be set first.
+ let!(:meeting) { create(:meeting, project: source_project, organisation: organisation, creator: admin) }
+
+ def move(current_user: admin, target: target_project)
+ described_class.call(meeting: meeting, target_project: target, current_user: current_user)
+ end
+
+ describe '#call' do
+ it 'moves the meeting into the target project' do
+ result = move
+
+ expect(result).to be_success
+ expect(meeting.reload.project_id).to eq(target_project.id)
+ end
+
+ it 'moves the booked time with it, billed sessions included' do
+ open_session = create(:time_session, project: source_project, organisation: organisation, meeting: meeting)
+ billed_session = create(:time_session, project: source_project, organisation: organisation, meeting: meeting,
+ billed: true, billed_at: 1.day.ago)
+ other_session = create(:time_session, project: source_project, organisation: organisation)
+
+ move
+
+ expect(open_session.reload.project_id).to eq(target_project.id)
+ expect(billed_session.reload.project_id).to eq(target_project.id)
+ expect(other_session.reload.project_id).to eq(source_project.id)
+ end
+
+ it "moves the meeting's notifications so the inbox rule reads the new project" do
+ notification = create(:notification, recipient: member, organisation: organisation,
+ notifiable: meeting, project: source_project)
+
+ move
+
+ expect(notification.reload.project_id).to eq(target_project.id)
+ end
+
+ it 'dismisses the open AI ticket suggestions and leaves the others alone' do
+ open_suggestion = create(:meeting_ticket_suggestion, meeting: meeting)
+ dismissed_suggestion = create(:meeting_ticket_suggestion, :dismissed, meeting: meeting)
+
+ move
+
+ expect(open_suggestion.reload).to be_dismissed
+ expect(dismissed_suggestion.reload).to be_dismissed
+ end
+
+ it 'records the move on both projects' do
+ move
+
+ moved_out = Activity.find_by(trackable: source_project, key: 'project.meeting_moved_out')
+ moved_in = Activity.find_by(trackable: target_project, key: 'project.meeting_moved_in')
+ expect(moved_out.secondary).to eq(meeting)
+ expect(moved_out.parameters).to include('meeting_title' => meeting.title, 'to_project_id' => target_project.id)
+ expect(moved_in.secondary).to eq(meeting)
+ expect(moved_in.parameters).to include('meeting_title' => meeting.title, 'from_project_id' => source_project.id)
+ end
+
+ describe '#preflight' do
+ it 'names the booked time, the billed part and the open suggestions' do
+ create(:time_session, project: source_project, organisation: organisation, meeting: meeting)
+ create(:time_session, project: source_project, organisation: organisation, meeting: meeting,
+ billed: true, billed_at: 1.day.ago)
+ create(:meeting_ticket_suggestion, meeting: meeting)
+
+ impact = described_class.new(meeting: meeting, target_project: target_project, current_user: admin).preflight
+
+ expect(impact).to include(time_sessions_count: 2, billed_time_sessions_count: 1,
+ open_suggestions_count: 1, ticket_links_count: 0)
+ end
+ end
+
+ context 'when refused' do
+ def expect_refusal(result, code)
+ expect(result).not_to be_success
+ expect(result.code).to eq(code)
+ expect(meeting.reload.project_id).to eq(source_project.id)
+ end
+
+ it 'refuses a meeting with a linked ticket' do
+ ticket = create(:ticket, project: source_project, organisation: organisation, creator: admin)
+ Reference.create!(source: meeting, target: ticket, target_title_snapshot: ticket.title)
+
+ expect_refusal(move, :has_ticket_links)
+ end
+
+ it 'refuses a meeting whose linked ticket is gone (the link survives as a tombstone)' do
+ ticket = create(:ticket, project: source_project, organisation: organisation, creator: admin)
+ Reference.create!(source: meeting, target: ticket, target_title_snapshot: ticket.title)
+ ticket.destroy!
+
+ expect_refusal(move, :has_ticket_links)
+ end
+
+ it 'refuses while an AI ticket suggestion run is active' do
+ MeetingTicketSuggestionRun.create!(meeting: meeting, organisation: organisation, project_id: source_project.id,
+ job_id: SecureRandom.uuid, meeting_title: meeting.title,
+ project_title: source_project.name, status: :running)
+
+ expect_refusal(move, :suggestion_run_active)
+ end
+
+ it 'moves when the active run is stale (a lost job must not block the move forever)' do
+ run = MeetingTicketSuggestionRun.create!(meeting: meeting, organisation: organisation,
+ project_id: source_project.id, job_id: SecureRandom.uuid,
+ meeting_title: meeting.title, project_title: source_project.name,
+ status: :queued)
+ run.update_columns(updated_at: (Meeting::SUGGESTIONS_STALE_AFTER + 1.minute).ago)
+
+ expect(move).to be_success
+ end
+
+ it 'refuses the project the meeting is already in' do
+ expect_refusal(move(target: source_project), :same_project)
+ end
+
+ it 'refuses a target project the user may not write meetings in' do
+ create(:project_permission, user: member, project: source_project, meetings_access: 'read_write')
+ create(:project_permission, user: member, project: target_project, meetings_access: 'read_only')
+
+ expect_refusal(move(current_user: member), :forbidden_target)
+ end
+
+ it 'refuses an archived target project' do
+ target_project.update!(archived_at: Time.current)
+
+ expect_refusal(move, :forbidden_target)
+ end
+ end
+ end
+end