Issue reopens on Reports coming in after instance update

[rails.git] / app / controllers / issues_controller.rb

diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb
index a00423a51680d8a9c4e0f56402abc009311a686b..4f88dce849605066cecd7a1ee11ba5519654cd5d 100644 (file)
--- a/app/controllers/issues_controller.rb
+++ b/app/controllers/issues_controller.rb
@@ -7,24 +7,26 @@ class IssuesController < ApplicationController
   before_action :find_issue, only: [:show, :resolve, :reopen, :ignore]
 
   def index
   before_action :find_issue, only: [:show, :resolve, :reopen, :ignore]
 
   def index

-    @issues = Issue.all
+    @issues = Issue.all.order(:status)

   end
 
   def show
     @read_reports = @issue.read_reports
     @unread_reports = @issue.unread_reports
     @comments = @issue.comments
   end
 
   def show
     @read_reports = @issue.read_reports
     @unread_reports = @issue.unread_reports
     @comments = @issue.comments

+    @related_issues = @issue.user.issues

   end
 
   def new
     unless create_new_issue_params.blank?
       @issue = Issue.find_or_initialize_by(create_new_issue_params)
   end
 
   def new
     unless create_new_issue_params.blank?
       @issue = Issue.find_or_initialize_by(create_new_issue_params)

-      puts params[:user_id].to_s + "--------------"

     end
   end
 
   def create
     @issue = Issue.find_by_reportable_id_and_reportable_type(params[:reportable_id],params[:reportable_type])
     end
   end
 
   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")
     if !@issue 
       @issue = Issue.find_or_initialize_by(issue_params)
       @admins = UserRole.where(role: "administrator")


@@ -32,19 +34,69 @@ class IssuesController < ApplicationController
         Notifier.new_issue_notification(User.find(admin.user_id)).deliver_now
       end
     end
         Notifier.new_issue_notification(User.find(admin.user_id)).deliver_now
       end
     end

-    @report = @issue.reports.build(report_params)
-    @report.user_id = @user.id
-    if @issue.save!
-      redirect_to root_path, notice: 'Issue was successfully created.'
+
+    # 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

     else
     else

-      render :new
+      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.create.provide_details')

     end
   end
 
     end
   end
 

+  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: 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')
+    end  
+  end
+

   def comment
     @issue = Issue.find(params[:id])
     @issue_comment = @issue.comments.build(issue_comment_params)
   def comment
     @issue = Issue.find(params[:id])
     @issue_comment = @issue.comments.build(issue_comment_params)

-    @issue_comment.user_id = @user.id
+    @issue_comment.commenter_user_id = @user.id

     @issue_comment.save!
     redirect_to @issue
   end
     @issue_comment.save!
     redirect_to @issue
   end


@@ -53,7 +105,7 @@ class IssuesController < ApplicationController
   def resolve
     if @issue.resolve
       @issue.save!
   def resolve
     if @issue.resolve
       @issue.save!

-      redirect_to @issue, notice: "Issue status has been set to: 'Resolved'"
+      redirect_to @issue, notice: t('issues.resolved')

     else
       render :show
     end
     else
       render :show
     end


@@ -62,7 +114,7 @@ class IssuesController < ApplicationController
   def ignore
     if @issue.ignore
       @issue.save!
   def ignore
     if @issue.ignore
       @issue.save!

-      redirect_to @issue, notice: "Issue status has been set to: 'Ignored'"
+      redirect_to @issue, notice: t('issues.ignored')

     else
       render :show
     end
     else
       render :show
     end


@@ -71,7 +123,7 @@ class IssuesController < ApplicationController
   def reopen
     if @issue.reopen
       @issue.save!
   def reopen
     if @issue.reopen
       @issue.save!

-      redirect_to @issue, notice: "Issue status has been set to: 'Open'"
+      redirect_to @issue, notice: t('issues.reopened')

     else
       render :show
     end
     else
       render :show
     end


@@ -91,11 +143,11 @@ class IssuesController < ApplicationController
     end
 
     def create_new_issue_params
     end
 
     def create_new_issue_params

-      params.permit(:reportable_id, :reportable_type, :user_id)
+      params.permit(:reportable_id, :reportable_type, :reported_user_id)

     end
 
     def issue_params
     end
 
     def issue_params

-      params.permit(:reportable_id, :reportable_type,:user_id)
+      params[:issue].permit(:reportable_id, :reportable_type,:reported_user_id)

     end
 
     def report_params
     end
 
     def report_params


@@ -103,6 +155,6 @@ class IssuesController < ApplicationController
     end
 
     def issue_comment_params
     end
 
     def issue_comment_params

-      params.require(:issue_comment).permit(:body, :user_id)
+      params.require(:issue_comment).permit(:body)

     end
 end
     end
 end