From 82ac67039401b6421e8ccf54aa2f2c9f1029c2b5 Mon Sep 17 00:00:00 2001
From: root21 <srchut@mail.existinthe.net>
Date: Wed, 25 Jan 2023 13:59:51 -0600
Subject: [PATCH] Added a New Command to Display CDRs to Customers

Created cdr_repo and now call it from a new command in the Bot, then filter the response through a form to display for the customer.
Refactored some aspects of lib/cdr.rb.
---
 forms/customer_cdr.rb | 13 ++++++++++++
 lib/cdr.rb            | 28 +++++++++++++++++---------
 lib/cdr_repo.rb       | 47 +++++++++++++++++++++++++++++++++++++++++++
 sgx_jmp.rb            | 15 ++++++++++++++
 web.rb                |  9 +++++++--
 5 files changed, 101 insertions(+), 11 deletions(-)
 create mode 100644 forms/customer_cdr.rb
 create mode 100644 lib/cdr_repo.rb

diff --git a/forms/customer_cdr.rb b/forms/customer_cdr.rb
new file mode 100644
index 0000000000000000000000000000000000000000..f1183d053c7062e2b706da53402c9987ce592aa1
--- /dev/null
+++ b/forms/customer_cdr.rb
@@ -0,0 +1,13 @@
+result!
+title "Call History"
+
+table(
+	@cdrs,
+	start: "Start",
+	direction: "Direction",
+	tel: "Number",
+	disposition: "Status",
+	duration: "Duration",
+	formatted_rate: "Rate",
+	formatted_charge: "Charge"
+)
diff --git a/lib/cdr.rb b/lib/cdr.rb
index 39cdaf6057bfb825e4e950fd7fc264ee0e868f53..c67a5dcd20586eaeec85021c12f3e70893b8a0b3 100644
--- a/lib/cdr.rb
+++ b/lib/cdr.rb
@@ -30,7 +30,25 @@ class CDR
 		billsec Integer
 		disposition Disposition
 		tel(/\A\+\d+\Z/)
-		direction Either(:inbound, :outbound)
+		direction Either(:inbound, :outbound), coerce: :to_sym.to_proc
+		rate Either(nil, BigDecimal), default: nil
+		charge Either(nil, BigDecimal), default: nil
+	end
+
+	def formatted_rate
+		"$%.4f" % rate
+	end
+
+	def formatted_charge
+		"$%.4f" % charge
+	end
+
+	def duration
+		"%02d:%02d:%02d" % [
+			billsec / (60 * 60),
+			billsec % (60 * 60) / 60,
+			billsec % 60
+		]
 	end
 
 	def self.for(event, **kwargs)
@@ -61,12 +79,4 @@ class CDR
 			direction: :outbound
 		)
 	end
-
-	def save
-		columns, values = to_h.to_a.transpose
-		DB.query_defer(<<~SQL, values)
-			INSERT INTO cdr (#{columns.join(',')})
-			VALUES ($1, $2, $3, $4, $5, $6, $7)
-		SQL
-	end
 end
diff --git a/lib/cdr_repo.rb b/lib/cdr_repo.rb
new file mode 100644
index 0000000000000000000000000000000000000000..7f5db2dac3f0c2206b8060419a1ee98336b15995
--- /dev/null
+++ b/lib/cdr_repo.rb
@@ -0,0 +1,47 @@
+# frozen_string_literal: true
+
+require_relative "cdr"
+
+class CDRRepo
+	def initialize(db: DB)
+		@db = db
+	end
+
+	def put(cdr)
+		data = cdr.to_h
+		data.delete(:rate)
+		data.delete(:charge)
+		columns, values = data.to_a.transpose
+		DB.query_defer(<<~SQL, values)
+			INSERT INTO cdr (#{columns.join(',')})
+			VALUES ($1, $2, $3, $4, $5, $6, $7)
+		SQL
+	end
+
+	def find_range(customer, range)
+		customer_id = customer.customer_id
+		cdrs = @db.query_defer(CDR_SQL, [customer_id, range.first, range.last])
+
+		cdrs.then do |rows|
+			rows.map { |row|
+				CDR.new(**row.transform_keys(&:to_sym))
+			}
+		end
+	end
+
+	CDR_SQL = <<~SQL
+		SELECT
+			cdr_id,
+			customer_id,
+			start,
+			billsec,
+			disposition,
+			tel,
+			direction,
+			rate,
+			charge
+		FROM cdr_with_charge
+		WHERE customer_id = $1 AND start >= $2 AND DATE_TRUNC('day', start) <= $3
+		ORDER BY start DESC
+	SQL
+end
diff --git a/sgx_jmp.rb b/sgx_jmp.rb
index cefb94d9e0f1cbdf07076c6dcda67f8596a9f134..e1de467d2657810448eeb732f666faf42fd065d9 100644
--- a/sgx_jmp.rb
+++ b/sgx_jmp.rb
@@ -526,6 +526,21 @@ Command.new(
 	end
 }.register(self).then(&CommandList.method(:register))
 
+Command.new(
+	"cdrs",
+	"Show Call Logs"
+) {
+	report_for = ((Date.today << 1)..Date.today)
+
+	Command.customer.then { |customer|
+		CDRRepo.new.find_range(customer, report_for)
+	}.then do |cdrs|
+		Command.finish do |reply|
+			reply.command << FormTemplate.render("customer_cdr", cdrs: cdrs)
+		end
+	end
+}.register(self).then(&CommandList.method(:register))
+
 Command.new(
 	"transactions",
 	"🧾 Show Transactions",
diff --git a/web.rb b/web.rb
index ff12e696967411dfcbdadf52ee7460679057011f..52dff555cb9b9973c83a6bc64f8062efd641b237 100644
--- a/web.rb
+++ b/web.rb
@@ -10,6 +10,7 @@ require "sentry-ruby"
 
 require_relative "lib/call_attempt_repo"
 require_relative "lib/cdr"
+require_relative "lib/cdr_repo"
 require_relative "lib/oob"
 require_relative "lib/rev_ai"
 require_relative "lib/roda_capture"
@@ -121,6 +122,10 @@ class Web < Roda
 		opts[:call_attempt_repo] || CallAttemptRepo.new
 	end
 
+	def cdr_repo
+		opts[:cdr_repo] || CDRRepo.new
+	end
+
 	def rev_ai
 		RevAi.new(logger: log.child(loggable_params))
 	end
@@ -200,7 +205,7 @@ class Web < Roda
 						end
 
 						customer_repo.find_by_tel(params["to"]).then do |customer|
-							CDR.for_inbound(customer.customer_id, params).save
+							cdr_repo.put(CDR.for_inbound(customer.customer_id, params))
 						end
 					end
 					"OK"
@@ -359,7 +364,7 @@ class Web < Roda
 					log.info "#{params['eventType']} #{params['callId']}", loggable_params
 					if params["eventType"] == "disconnect"
 						call_attempt_repo.ending_call(c, params["callId"])
-						CDR.for_outbound(params).save.catch(&method(:log_error))
+						cdr_repo.put(CDR.for_outbound(params)).catch(&method(:log_error))
 					end
 					"OK"
 				end