From c7bc13668b78afde72e9b8f6644b001799e84eb9 Mon Sep 17 00:00:00 2001 From: Shrey Date: Wed, 10 Jun 2015 11:51:51 +0530 Subject: [PATCH] Issue reopens on Reports coming in after instance update --- app/controllers/issues_controller.rb | 38 ++++++++++++++++++++++++++-- app/models/issue.rb | 4 +-- config/locales/en-GB.yml | 3 ++- config/locales/en.yml | 3 ++- db/structure.sql | 4 +++ 5 files changed, 46 insertions(+), 6 deletions(-) diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb index edb48e64c..4f88dce84 100644 --- a/app/controllers/issues_controller.rb +++ b/app/controllers/issues_controller.rb @@ -7,7 +7,7 @@ class IssuesController < ApplicationController before_action :find_issue, only: [:show, :resolve, :reopen, :ignore] def index - @issues = Issue.all + @issues = Issue.all.order(:status) end def show @@ -25,6 +25,8 @@ class IssuesController < ApplicationController def create @issue = Issue.find_by_reportable_id_and_reportable_type(params[:reportable_id],params[:reportable_type]) + + # Check if Issue alrwady exists if !@issue @issue = Issue.find_or_initialize_by(issue_params) @admins = UserRole.where(role: "administrator") @@ -32,11 +34,22 @@ class IssuesController < ApplicationController Notifier.new_issue_notification(User.find(admin.user_id)).deliver_now end end + + # Check if details provided are sufficient if params[:report][:details] and (params[:spam] or params[:offensive] or params[:threat] or params[:vandal] or params[:other]) @report = @issue.reports.build(report_params) details = params[:report][:details].to_s + "||" + params[:spam].to_s + "||" + params[:offensive].to_s + "||" + params[:threat].to_s + "||" + params[:vandal].to_s + "||" + params[:other].to_s @report.reporter_user_id = @user.id @report.details = details + + # Checking if instance has been updated since last report + @last_report = @issue.reports.order(updated_at: :desc).last + if @issue.reportable.updated_at.present? and (@issue.ignored? or @issue.resolved?) and @issue.reportable.updated_at > @last_report.updated_at + if @issue.reopen + @issue.save! + end + end + if @issue.save! redirect_to root_path, notice: t('issues.create.successful_report') end @@ -47,12 +60,33 @@ class IssuesController < ApplicationController def update @issue = Issue.find_by(issue_params) + + # Check if details provided are sufficient if params[:report][:details] and (params[:spam] or params[:offensive] or params[:threat] or params[:vandal] or params[:other]) @report = @issue.reports.where(reporter_user_id: @user.id).first + + if @report == nil + @report = @issue.reports.build(report_params) + @report.reporter_user_id = @user.id + notice = t('issues.update.new_report') + end + details = params[:report][:details].to_s + "||" + params[:spam].to_s + "||" + params[:offensive].to_s + "||" + params[:threat].to_s + "||" + params[:vandal].to_s + "||" + params[:other].to_s @report.details = details + + # Checking if instance has been updated since last report + @last_report = @issue.reports.order(updated_at: :desc).last + if @issue.reportable.updated_at.present? and (@issue.ignored? or @issue.resolved?) and @issue.reportable.updated_at > @last_report.updated_at + @issue.reopen + @issue.save! + end + + if notice == nil + notice = t('issues.update.successful_update') + end + if @report.save! - redirect_to root_path, notice: t('issues.update.successful_update') + redirect_to root_path, notice: notice end else redirect_to new_issue_path(reportable_type: @issue.reportable_type,reportable_id: @issue.reportable_id, reported_user_id: @issue.reported_user_id), notice: t('issues.update.provide_details') diff --git a/app/models/issue.rb b/app/models/issue.rb index cd3f5150d..604b73d98 100644 --- a/app/models/issue.rb +++ b/app/models/issue.rb @@ -14,11 +14,11 @@ class Issue < ActiveRecord::Base scope :with_status, -> (issue_status) { where(:status => statuses[issue_status])} def read_reports - resolved_at.present? ? reports.where("created_at < ?", resolved_at) : nil + resolved_at.present? ? reports.where("updated_at < ?", resolved_at) : nil end def unread_reports - resolved_at.present? ? reports.where("created_at >= ?", resolved_at) : reports + resolved_at.present? ? reports.where("updated_at >= ?", resolved_at) : reports end include AASM diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml index 9e2ae2149..13349d511 100644 --- a/config/locales/en-GB.yml +++ b/config/locales/en-GB.yml @@ -944,7 +944,8 @@ en-GB: successful_report: Your report has been registered sucessfully provide_details: Please provide the required details update: - successful_update: Your report was successfully updated + new_report: Your report been registered sucessfully + successful_update: Your report has been updated successfully provide_details: Please provide the required details new: details: Please provide some more details into the problem. (This field cannot be left blank!) diff --git a/config/locales/en.yml b/config/locales/en.yml index bb66f962b..517f3a866 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -914,7 +914,8 @@ en: successful_report: Your report has been registered sucessfully provide_details: Please provide the required details update: - successful_update: Your report was successfully updated + new_report: Your report been registered sucessfully + successful_update: Your report has been updated successfully provide_details: Please provide the required details new: details: Please provide some more details into the problem. (This field cannot be left blank!) diff --git a/db/structure.sql b/db/structure.sql index 6b34868e1..e19788329 100644 --- a/db/structure.sql +++ b/db/structure.sql @@ -151,6 +151,10 @@ CREATE FUNCTION xid_to_int4(xid) RETURNS integer AS '$libdir/libpgosm', 'xid_to_int4'; +SET default_tablespace = ''; + +SET default_with_oids = false; + SET default_tablespace = ''; SET default_with_oids = false; -- 2.43.2