From f5b2a9bcc3e391f47098149fffe9d0e5ec87f296 Mon Sep 17 00:00:00 2001
From: Jeremy Rudman <jeremyrudman@gmail.com>
Date: Sat, 30 Jan 2021 21:46:16 -0500
Subject: [PATCH 1/2] fix(events): fixed api to be public and have blank
 strings be null

---
 app/controllers/events_controller.rb       |  7 +++++++
 app/models/event.rb                        | 14 ++++++++++++++
 config/routes.rb                           |  2 ++
 test/controllers/events_controller_test.rb |  7 +++++++
 4 files changed, 30 insertions(+)
 create mode 100644 app/controllers/events_controller.rb
 create mode 100644 test/controllers/events_controller_test.rb

diff --git a/app/controllers/events_controller.rb b/app/controllers/events_controller.rb
new file mode 100644
index 000000000..30c5b00ba
--- /dev/null
+++ b/app/controllers/events_controller.rb
@@ -0,0 +1,7 @@
+class EventsController < ApplicationController
+  respond_to :json
+
+  def show
+    render json: Event.all
+  end
+end
diff --git a/app/models/event.rb b/app/models/event.rb
index 30d57d85e..7cd22d711 100644
--- a/app/models/event.rb
+++ b/app/models/event.rb
@@ -9,4 +9,18 @@ def finish_before_start
       errors.add(:finish, 'time must be after start time')
     end
   end
+
+  def description=(value)
+    if value.blank?
+      value = nil
+    end
+    super value
+  end
+
+  def location=(value)
+    if value.blank?
+      value = nil
+    end
+    super value
+  end
 end
diff --git a/config/routes.rb b/config/routes.rb
index 66b01e931..d249407b0 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -40,6 +40,8 @@
     patch :boarded_bus, on: :collection
   end
 
+  resource :events, only: :show, constraints: ->(req) { req.format == :json }
+
   namespace :manage do
     authenticate :user, ->(u) { u.director? } do
       root to: "dashboard#index"
diff --git a/test/controllers/events_controller_test.rb b/test/controllers/events_controller_test.rb
new file mode 100644
index 000000000..6b003df20
--- /dev/null
+++ b/test/controllers/events_controller_test.rb
@@ -0,0 +1,7 @@
+require 'test_helper'
+
+class EventsControllerTest < ActionDispatch::IntegrationTest
+  # test "the truth" do
+  #   assert true
+  # end
+end

From 64ba808592f9b6e9eafdbd54694a16488f208185 Mon Sep 17 00:00:00 2001
From: Jeremy Rudman <jeremyrudman@gmail.com>
Date: Sun, 31 Jan 2021 22:05:54 -0500
Subject: [PATCH 2/2] made is so category is null on empty string

---
 app/models/event.rb | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/app/models/event.rb b/app/models/event.rb
index 7cd22d711..e5dde9abf 100644
--- a/app/models/event.rb
+++ b/app/models/event.rb
@@ -23,4 +23,11 @@ def location=(value)
     end
     super value
   end
+
+  def category=(value)
+    if value.blank?
+      value = nil
+    end
+    super value
+  end
 end