From 2fcc99cccf51c8910aef5ebffd1ce9c18f6fc7d1 Mon Sep 17 00:00:00 2001
From: mgabdev <>
Date: Tue, 5 Jan 2021 11:35:23 -0500
Subject: [PATCH] merge resolving

---
 app/models/chat_conversation_account.rb | 2 +-
 db/schema.rb                            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/models/chat_conversation_account.rb b/app/models/chat_conversation_account.rb
index b2ac7bda..dad54cac 100644
--- a/app/models/chat_conversation_account.rb
+++ b/app/models/chat_conversation_account.rb
@@ -12,7 +12,7 @@
 #  is_approved                    :boolean          default(FALSE), not null
 #  created_at                     :datetime         not null
 #  updated_at                     :datetime         not null
-#  unread_count                   :bigint(8)        default(0)
+#  unread_count                   :bigint(8)        default(0), not null
 #  chat_message_expiration_policy :string
 #  is_muted                       :boolean          default(FALSE), not null
 #
diff --git a/db/schema.rb b/db/schema.rb
index 6bb8bf98..9c022764 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -221,7 +221,7 @@ ActiveRecord::Schema.define(version: 2021_01_03_150000) do
     t.boolean "is_approved", default: false, null: false
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
-    t.bigint "unread_count", default: 0
+    t.bigint "unread_count", default: 0, null: false
     t.string "chat_message_expiration_policy"
     t.boolean "is_muted", default: false, null: false
     t.index ["account_id"], name: "index_chat_conversation_accounts_on_account_id"