Skip to content

Commit

Permalink
Merge pull request #634 from ChicagoWorldcon/change-report-fixes
Browse files Browse the repository at this point in the history 
plan-712, plan-713, plan-714, plan-715 Change report fixes
  • Loading branch information
@Gailbear
Gailbear authored Aug 15, 2022
2 parents f42657f + 06c6cd6 commit d9a9d13
Show file tree
Hide file tree
Showing 2 changed files with 162 additions and 100 deletions.
257 changes: 161 additions & 96 deletions app/controllers/reports/schedule_reports_controller.rb
View file
Original file line number Diff line number Diff line change
@@ -1,182 +1,247 @@
class Reports::ScheduleReportsController < ApplicationController
around_action :set_timezone

#
# Get the sched diffs based on "publication dates"
#
def schedule_diff
authorize Person, policy_class: Reports::ScheduleReportPolicy

# TODO: base the from and to on the publish ids and this will be ok as a get
pd_from = PublicationDate.find params[:from] if params[:from]

from = pd_from.timestamp if pd_from
from ||= PublicationDate.order('created_at desc').first&.timestamp
from ||= Time.now - 2.year # TODO: for testing
from ||= Time.now - 2.year

pd_to = PublicationDate.find params[:to] if params[:to]
to = pd_to.timestamp if pd_to
live = false

# changes = ChangeService.published_changes(from: from, to: to)
changes = if to
ChangeService.published_changes(from: from, to: to)
else
live = true
ChangeService.session_changes(from: from)
end

to ||= Time.now
workbook = FastExcel.open(constant_memory: true)
date_time_style = workbook.number_format(EXCEL_NBR_FORMAT)

session_time_changed = workbook.add_worksheet("Session Time Changed")
session_room_changed = workbook.add_worksheet("Session Room Changed")
session_title_changed = workbook.add_worksheet("Session Title Changed")
session_description_changed = workbook.add_worksheet("Session Description Changed")
session_added = workbook.add_worksheet("Sessions Add")
session_removed = workbook.add_worksheet("Sessions Removed")
workbook = FastExcel.open(constant_memory: true)
init_sheets(workbook: workbook)

participants_fully_dropped = workbook.add_worksheet("Participants Dropped")
participants_add_drop = workbook.add_worksheet("Participants Add Drop")
# Rails.logger.debug "******** CHANGES: #{changes[:sessions]}"
state_change_sessions = check_sessions_changed(
changes: changes[:sessions],
live: live
)
fully_dropped = check_assignments_changed(
changes: changes[:assignments],
state_change_sessions: state_change_sessions
)

tab_headers(session_time_changed, session_room_changed, session_title_changed, session_description_changed, session_added, session_removed, participants_add_drop, participants_fully_dropped)
fully_dropped.uniq.each do |name|
@participants_fully_dropped.append_row(name)
end

# Rails.logger.debug "******** CHANGES: #{changes[:sessions]}"
send_data workbook.read_string,
filename: "ScheduleDiff-#{from.strftime('%m-%d-%Y_%H_%M')}_to_#{to.strftime('%m-%d-%Y_%H_%M')}.xlsx",
disposition: 'attachment'
end

#
#
#
def check_sessions_changed(changes:, live:)
state_change_sessions = []
changes[:sessions].values.sort{|a,b| (a[:object] ? a[:object].title : '') <=> (b[:object] ? b[:object].title : '')}.each do |change|
# Rails.logger.debug "******** CHANGE: #{change}"
changes.values.sort{|a,b| (a[:object] ? a[:object].title : '') <=> (b[:object] ? b[:object].title : '')}.each do |change|
next unless change[:object]

if change[:changes]['room_id'] || change[:changes]['start_time']
if change[:changes]['room_id'] && change[:changes]['start_time'] &&
((!change[:changes]['room_id'][0] && change[:changes]['room_id'][1]) ||
(!change[:changes]['start_time'][0] && change[:changes]['start_time'][1]))
session_added_row(session_added, change, date_time_style)
live_add(session: change[:object], sheet: participants_add_drop) if live
if (change[:changes]['room_id'] || change[:changes]['start_time']) && !change[:changes]['status']
# Rails.logger.debug "******** SESSION ADD/REMOVE #{change[:changes]['status']} "
if room_added?(change) || start_time_added?(change)
session_added_row(@session_added, change)
live_add(session: change[:object], sheet: @participants_add_drop) if live
next
else
if (change[:changes]['room_id'] && !change[:changes]['room_id'][1]) || (change[:changes]['start_time'] && !change[:changes]['start_time'][1])|| change[:event] == 'destroy'
# Rails.logger.debug "******** removed because room or time"
session_removed_row(session_removed, change)
live_drop(session: change[:object], sheet: participants_add_drop) if live
next
else
if change[:changes]['room_id']
session_room_change_row(session_room_changed, change)
end
if change[:changes]['start_time']
session_time_change_row(session_time_changed, change, date_time_style)
end
end
end

if room_removed?(change) || start_time_removed?(change)
session_removed_row(@session_removed, change)
live_drop(session: change[:object], sheet: @participants_add_drop) if live
next
end

if change[:changes]['room_id']
session_room_change_row(@session_room_changed, change)
end

if change[:changes]['start_time']
session_time_change_row(@session_time_changed, change)
end
end

if change[:object].start_time && change[:object].room_id
if change[:changes]['status']
if (change[:changes]['status'][1] == 'draft' || change[:changes]['status'][1] == 'dropped')
# Rails.logger.debug "******** removed because draft"
session_removed_row(session_removed, change)
if live
live_drop(session: change[:object], sheet: participants_add_drop)
state_change_sessions << change[:object].id
end
next
elsif (change[:changes]['status'][0] == 'draft' || change[:changes]['status'][0] == 'dropped')
# Rails.logger.debug "******** added because state change"
session_added_row(session_added, change, date_time_style)
if live
live_add(session: change[:object], sheet: participants_add_drop)
state_change_sessions << change[:object].id
end
next
end
session_id = check_status_change(change: change, live: live)

if session_id
state_change_sessions << session_id
next
end

if change[:changes]['title']
session_title_change_row(session_title_changed, change)
session_title_change_row(@session_title_changed, change)
end
if change[:changes]['description']
session_description_change_row(session_description_changed, change)
session_description_change_row(@session_description_changed, change)
end
end
end

# Deal with the assignment changes
Rails.logger.debug "*********** ST #{state_change_sessions}"

return state_change_sessions
end

def room_added?(change)
!change[:changes]['room_id'][0] && change[:changes]['room_id'][1]
end

def start_time_added?(change)
!change[:changes]['start_time'][0] && change[:changes]['start_time'][1]
end

def room_removed?(change)
change[:changes]['room_id'][0] && !change[:changes]['room_id'][1]
end

def start_time_removed?(change)
change[:changes]['start_time'][0] && !change[:changes]['start_time'][1]
end

def check_assignments_changed(changes:, state_change_sessions:)
moderator = SessionAssignmentRoleType.find_by(name: 'Moderator')
participant = SessionAssignmentRoleType.find_by(name: 'Participant')
roles = [moderator.id, participant.id]
# Rails.logger.debug "******** ROLES #{roles}"

# TODO: sort .... ??? how
fully_dropped = []
changes[:assignments].each do |id, change|
# next unless change[:object]
changes.each do |id, change|
changed_assignment = change[:object]
changed_assignment ||= SessionAssignment.find change[:session_assignment_id]
next if state_change_sessions.include? change[:object].session_id
changed_assignment ||= SessionAssignment.find(change[:item_id]) if SessionAssignment.exists?(change[:item_id])

next if state_change_sessions.include?(changed_assignment.session_id || changed_assignment.published_session_id)

session = changed_assignment.session if changed_assignment.session
session ||= Session.find changed_assignment.session_id
session = if changed_assignment
changed_assignment.session
else
session_id = change[:published_session_id] || change[:session_id]
Session.find session_id if Session.exists? session_id
end
next unless session

# Rails.logger.debug "******** Assignment changes #{change}"
person = change[:object].person
person ||= Session.find change[:person_id] if Session.exists? change[:person_id]
next unless person

# Participants add/drop
if change[:changes]['session_assignment_role_type_id'] && change[:event] != 'destroy'
if session.start_time && session.room_id
if (roles.include?(change[:changes]['session_assignment_role_type_id'][1]))
participants_add_drop.append_row(
@participants_add_drop.append_row(
[
session.title,
'',
changed_assignment.person.published_name
person.published_name
]
)
elsif (roles.include?(change[:changes]['session_assignment_role_type_id'][0]))
participants_add_drop.append_row(
@participants_add_drop.append_row(
[
session.title,
changed_assignment.person.published_name,
person.published_name,
]
)
if changed_assignment.person.sessions.scheduled.count == 0
fully_dropped.append [change[:object].person.published_name]

if ['declined', 'rejected'].include? person.con_state
fully_dropped.append [person.published_name]
end
end
end
else
# Rails.logger.debug "******** Assignment EVENT DROP ????"
if change[:event] == 'destroy'
participants_add_drop.append_row(
@participants_add_drop.append_row(
[
session.title,
changed_assignment.person.published_name,
person.published_name,
]
)
if changed_assignment.person.sessions.scheduled.count == 0
fully_dropped.append [changed_assignment.person.published_name]
if ['declined', 'rejected'].include? person.con_state
fully_dropped.append [person.published_name]
end
end
end
end

fully_dropped.uniq.each do |name|
participants_fully_dropped.append_row(name)
return fully_dropped
end

def check_status_change(change:, live: false)
# Rails.logger.debug "********* STATUS CHANGE"
return unless change[:changes]['status']
return if ['draft', 'dropped'].include?(change[:changes]['status'][0]) && ['draft', 'dropped'].include?(change[:changes]['status'][1])

# Rails.logger.debug "********* STATUS CHANGE ..... #{change[:changes]['status']}"
if ['draft', 'dropped'].include?(change[:changes]['status'][1])
if live
return unless change[:object].published_session

session_removed_row(@session_removed, change)
live_drop(session: change[:object], sheet: @participants_add_drop)

return change[:object].id
else
session_removed_row(@session_removed, change)
end

return
end

send_data workbook.read_string,
filename: "ScheduleDiff-#{from.strftime('%m-%d-%Y_%H_%M')}_to_#{to.strftime('%m-%d-%Y_%H_%M')}.xlsx",
disposition: 'attachment'
if ['draft', 'dropped'].include?(change[:changes]['status'][0])
# Rails.logger.debug "********* STATUS CHANGE ..... ADDD #{live}"
session_added_row(@session_added, change)
if live
live_add(session: change[:object], sheet: @participants_add_drop)

return change[:object].id
end

return
end
end


def init_sheets(workbook:)
@session_time_changed = workbook.add_worksheet("Session Time Changed")
@session_room_changed = workbook.add_worksheet("Session Room Changed")
@session_title_changed = workbook.add_worksheet("Session Title Changed")
@session_description_changed = workbook.add_worksheet("Session Description Changed")
@session_added = workbook.add_worksheet("Sessions Add")
@session_removed = workbook.add_worksheet("Sessions Removed")
@participants_fully_dropped = workbook.add_worksheet("Participants Dropped")
@participants_add_drop = workbook.add_worksheet("Participants Add Drop")

@date_time_style = workbook.number_format(EXCEL_NBR_FORMAT)
tab_headers
end

def tab_headers(session_time_changed, session_room_changed, session_title_changed, session_description_changed, session_added, session_removed, participants_add_drop, participants_fully_dropped)
session_time_changed.append_row(['Session Title','Original Start Time', 'New Start Time'])
session_room_changed.append_row(['Session Title','Original Room', 'New Room'])
session_title_changed.append_row(['Original Session Title', 'New Session Title'])
session_description_changed.append_row(['Session Title','Original Description', 'New Description'])
session_added.append_row(['Session Title', 'Session Description', 'Format', 'Areas', 'Start Time', 'Room', 'Moderators', 'Participants'])
session_removed.append_row(['Session Title'])
def tab_headers
@session_time_changed.append_row(['Session Title','Original Start Time', 'New Start Time'])
@session_room_changed.append_row(['Session Title','Original Room', 'New Room'])
@session_title_changed.append_row(['Original Session Title', 'New Session Title'])
@session_description_changed.append_row(['Session Title','Original Description', 'New Description'])
@session_added.append_row(['Session Title', 'Session Description', 'Format', 'Areas', 'Start Time', 'Room', 'Moderators', 'Participants'])
@session_removed.append_row(['Session Title'])

participants_add_drop.append_row(['Session Title', 'Participant Dropped', 'Participant Added'])
participants_fully_dropped.append_row(['Participant Dropped'])
@participants_add_drop.append_row(['Session Title', 'Participant Dropped', 'Participant Added'])
@participants_fully_dropped.append_row(['Participant Dropped'])
end

def live_add(session:, sheet:)
Expand Down Expand Up @@ -242,7 +307,7 @@ def session_removed_row(sheet, change)
)
end

def session_time_change_row(sheet, change, date_time_style)
def session_time_change_row(sheet, change)
orig_time = Time.parse(change[:changes]['start_time'][0]) if change[:changes]['start_time'][0]
new_time = Time.parse(change[:changes]['start_time'][1]) if change[:changes]['start_time'][1]
# Rails.logger.debug "********* #{change[:changes]['start_time'][1]} => #{new_time.class} #{new_time.strftime("%H")}"
Expand All @@ -253,13 +318,13 @@ def session_time_change_row(sheet, change, date_time_style)
new_time ? FastExcel.date_num(new_time, new_time.in_time_zone.utc_offset) : nil
],
[
nil, date_time_style, date_time_style
nil, @date_time_style, @date_time_style
]
)
end

# Generate a row for sessions added
def session_added_row(sheet, change, date_time_style)
def session_added_row(sheet, change)
moderator = SessionAssignmentRoleType.find_by(name: 'Moderator')
participant = SessionAssignmentRoleType.find_by(name: 'Participant')

Expand All @@ -277,7 +342,7 @@ def session_added_row(sheet, change, date_time_style)
change[:object].participant_assignments.where("session_assignment_role_type_id = ?", participant).collect{|a| a.person.published_name}.join("; ")
],
[
nil, nil, nil, nil, date_time_style, nil, nil, nil
nil, nil, nil, nil, @date_time_style, nil, nil, nil
]
)
end
Expand Down
5 changes: 1 addition & 4 deletions app/services/change_service.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,6 @@ def self.get_changes(clazz:, type:, from:, to:, publishable_session_ids: nil)
audits = audits.where("created_at >= ?", from) if from
audits = audits.where("created_at <= ?", to) if to

# Rails.logger.debug "**** AUDITS #{audits.count}"

grouped_audits = audits.group_by {|a| a.item_id}

grouped_audits.each do |key, item_audits|
Expand All @@ -64,12 +62,11 @@ def self.get_changes(clazz:, type:, from:, to:, publishable_session_ids: nil)
if publishable_session_ids
next unless publishable_session_ids.include?(obj.session_id)
end
changes[key] = {event: audit.event, object: obj, changes: audit.object_changes}
changes[key] = {item_id: audit.item_id, event: audit.event, object: obj, changes: audit.object_changes}
end
end
end

# TODO: any way we can order by the session title ???
changes
end

Expand Down

0 comments on commit d9a9d13

Please sign in to comment.