improve issues

.rubocop_todo.yml

@@ -1,28 +1,22 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2023-12-20 18:20:53 UTC using RuboCop version 1.56.2.
+# on 2024-03-25 17:29:24 UTC using RuboCop version 1.56.2.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
-# Offense count: 1
-# Configuration parameters: AllowedMethods, AllowedPatterns.
-Lint/NestedMethodDefinition:
-  Exclude:
-    - 'app/models/maintenance_contract_model.rb'
-
-# Offense count: 4
+# Offense count: 7
 # Configuration parameters: AllowedMethods, AllowedPatterns, CountRepeatedAttributes.
 Metrics/AbcSize:
   Max: 34
 
-# Offense count: 4
+# Offense count: 12
 # Configuration parameters: CountComments, CountAsOne, AllowedMethods, AllowedPatterns.
 Metrics/MethodLength:
   Max: 23
 
-# Offense count: 3
+# Offense count: 4
 # Configuration parameters: AllowedMethods.
 # AllowedMethods: respond_to_missing?
 Style/OptionalBooleanParameter:
@@ -31,9 +25,9 @@ Style/OptionalBooleanParameter:
     - 'app/models/maintenance_contract_model.rb'
     - 'app/utils/analytics/finances/models/financial_statements_of_work.rb'
 
-# Offense count: 2
+# Offense count: 9
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, AllowedPatterns.
 # URISchemes: http, https
 Layout/LineLength:
-  Max: 124
+  Max: 130

app/controllers/issues_controller.rb

@@ -4,7 +4,13 @@ class IssuesController < ApplicationController
   before_action :set_project, only: %i[index]
 
   def index
-    @issues = Issue.where.not(closed_date: nil).where(project: @project, closed_date: start_date..end_date)
+    @issues = Issue.where(project: @project)
+
+    @issues = @issues.where.not(closed_date: nil) if closed == 'true'
+
+    @issues = @issues.where(
+      '(closed_date BETWEEN :start_date AND :end_date) OR (reported_at BETWEEN :start_date AND :end_date)', start_date:, end_date:
+    )
   end
 
   private
@@ -20,4 +26,8 @@ def start_date
   def end_date
     params[:end_date]
   end
+
+  def closed
+    params[:closed]
+  end
 end

app/models/issue.rb

@@ -8,12 +8,14 @@
 #  closed_date :datetime
 #  effort      :float
 #  issue_type  :string
+#  reported_at :datetime
 #  state       :string
 #  title       :string
 #  created_at  :datetime         not null
 #  updated_at  :datetime         not null
 #  issue_id    :string
 #  project_id  :bigint           not null
+#  tts_id      :string
 #  user_id     :bigint           not null
 #
 # Indexes

app/services/issues_creator.rb

@@ -7,16 +7,21 @@ def initialize(project)
   end
 
   def call
-    @project.issues.destroy_all
+    ActiveRecord::Base.transaction do
+      @project.issues.destroy_all
 
-    issues = issues_client_class.new(@project).list
-    issues.map do |issue|
-      next unless issue.user
+      issues = issues_client_class.new(@project).list
+      issues.map do |issue|
+        next unless issue.user
 
-      Issue.create!(project: @project, effort: issue.effort, user: issue.user, state: issue.state,
-                    closed_date: issue.closed_date, issue_id: issue.issue_id, title: issue.title,
-                    issue_type: issue.issue_type)
+        Issue.create!(project: @project, effort: issue.effort, user: issue.user, state: issue.state,
+                      closed_date: issue.closed_date, title: issue.title,
+                      issue_type: issue.issue_type, reported_at: issue.reported_at, tts_id: issue.tts_id)
+      end
     end
+  rescue StandardError => e
+    Rails.logger.error("Failed to process issues due to error: #{e.message}")
+    raise
   end
 
   private

app/utils/clients/tts/azure/issue.rb

@@ -8,6 +8,7 @@ def list
           issues_list = ::Request.post(url, customer_authorization, body)
           urls = issues_list['workItems'].pluck('url')
           work_items = urls.map { |url| ::Request.get(url, customer_authorization) }
+
           parsed_items = work_items.map do |work_item|
             parser.new(work_item, project)
           end
@@ -16,7 +17,7 @@ def list
         end
 
         def filtered_items(parsed_items)
-          parsed_items.select { |item| item.issue_type == 'Product Backlog Item' }
+          parsed_items
         end
 
         def parser

app/utils/clients/tts/azure/parsers/ministry_brands_parser.rb

@@ -40,7 +40,11 @@ def issue_type
             'Task'
           end
 
-          def issue_id
+          def reported_at
+            json.dig('fields', 'System.CreatedDate')
+          end
+
+          def tts_id
             json['id'].to_s
           end
         end

app/views/issues/_issue.json.jbuilder

@@ -1,7 +1,3 @@
 # frozen_string_literal: true
 
-json.extract! issue, :id, :effort, :user_id, :state, :closed_date
-
-json.user do |json|
-  json.partial! 'users/user', user: issue.user
-end
+json.extract! issue, :id, :effort, :user_id, :state, :closed_date, :title, :issue_type, :reported_at, :tts_id

db/migrate/20240325011015_add_reported_on_to_issues.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddReportedOnToIssues < ActiveRecord::Migration[7.0]
+  def change
+    add_column :issues, :reported_at, :datetime
+  end
+end

db/migrate/20240325040617_add_identifier_to_issues.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddIdentifierToIssues < ActiveRecord::Migration[7.0]
+  def change
+    add_column :issues, :tts_id, :string
+  end
+end

spec/factories/issues.rb

@@ -8,12 +8,14 @@
 #  closed_date :datetime
 #  effort      :float
 #  issue_type  :string
+#  reported_at :datetime
 #  state       :string
 #  title       :string
 #  created_at  :datetime         not null
 #  updated_at  :datetime         not null
 #  issue_id    :string
 #  project_id  :bigint           not null
+#  tts_id      :string
 #  user_id     :bigint           not null
 #
 # Indexes

spec/models/issue_spec.rb

@@ -8,12 +8,14 @@
 #  closed_date :datetime
 #  effort      :float
 #  issue_type  :string
+#  reported_at :datetime
 #  state       :string
 #  title       :string
 #  created_at  :datetime         not null
 #  updated_at  :datetime         not null
 #  issue_id    :string
 #  project_id  :bigint           not null
+#  tts_id      :string
 #  user_id     :bigint           not null
 #
 # Indexes