Issue reopens on Reports coming in after instance update

diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb
index edb48e64c0d73a4b38ea3b3cf3800a7fed2d0efc..4f88dce849605066cecd7a1ee11ba5519654cd5d 100644 (file)
--- 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 cd3f5150d8219e977278e89807a59324012567cb..604b73d986ef69b9bda2e5897c0a7e3d0fcb282e 100644 (file)
--- 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 9e2ae21494d16418583da032aef486d32ea0d75a..13349d511ef6c8c7b2a4837b04a20237c4cbacac 100644 (file)
--- 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 bb66f962b65eb68547f460e540af3ddd6c78a951..517f3a866f41d69325216c4e88284546298f1f69 100644 (file)
--- 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 6b34868e149a736956809c6dd0f01159f4040f9f..e19788329962a50a1b931e3474b08d8ee13c8438 100644 (file)
--- 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;