From f23a4c6373067ca7aefdff56e16aa87c2ff92ecb Mon Sep 17 00:00:00 2001
From: Dominic Grimm <dominic.grimm@gmail.com>
Date: Mon, 7 Mar 2022 11:01:21 +0100
Subject: [PATCH] Clean up `#not_nil!` uses

---
 docker/backend/src/backend/api/context.cr        | 2 +-
 docker/backend/src/backend/api/schema/helpers.cr | 4 ++--
 docker/backend/src/backend/api/schema/user.cr    | 6 +++---
 docker/backend/src/backend/worker.cr             | 3 +--
 4 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/docker/backend/src/backend/api/context.cr b/docker/backend/src/backend/api/context.cr
index e78b457..6061f39 100644
--- a/docker/backend/src/backend/api/context.cr
+++ b/docker/backend/src/backend/api/context.cr
@@ -50,7 +50,7 @@ module Backend
 
           if @user
             @admin = @user.not_nil!.admin
-            @role = Schema::UserRole.parse(@user.not_nil!.role).not_nil!
+            @role = Schema::UserRole.parse(@user.not_nil!.role)
             @external =
               case @role.not_nil!
               when .teacher?
diff --git a/docker/backend/src/backend/api/schema/helpers.cr b/docker/backend/src/backend/api/schema/helpers.cr
index 9c4174c..deaff3e 100644
--- a/docker/backend/src/backend/api/schema/helpers.cr
+++ b/docker/backend/src/backend/api/schema/helpers.cr
@@ -42,7 +42,7 @@ module Backend
             end
 
             def initialize(id : Int32)
-              @model = {{ type }}.find(id).not_nil!
+              @model = {{ type }}.find!(id)
             end
 
             {% space_name = type.names.last.underscore.gsub(/_/, " ").capitalize %}
@@ -50,7 +50,7 @@ module Backend
             @[GraphQL::Field]
             # {{ space_name }}'s ID
             def id : Int32
-              @model.id.not_nil!.to_i32
+              @model.id.not_nil!.to_i
             end
           end
         end
diff --git a/docker/backend/src/backend/api/schema/user.cr b/docker/backend/src/backend/api/schema/user.cr
index 38d1994..047feb7 100644
--- a/docker/backend/src/backend/api/schema/user.cr
+++ b/docker/backend/src/backend/api/schema/user.cr
@@ -82,9 +82,9 @@ module Backend
             @model.teacher
           when .student?
             @model.student
-          end.not_nil!.id.not_nil!.to_i
-        rescue NilAssertionError
-          nil
+          end
+            .try(&.id)
+            .try(&.to_i)
         end
 
         @[GraphQL::Field]
diff --git a/docker/backend/src/backend/worker.cr b/docker/backend/src/backend/worker.cr
index fc8a39f..f193c79 100644
--- a/docker/backend/src/backend/worker.cr
+++ b/docker/backend/src/backend/worker.cr
@@ -25,8 +25,7 @@ module Mosquito::Serializers::Granite
     end
 
     def deserialize_{{ method_suffix }}(raw : String) : {{ klass.id }}
-      id = raw.to_i
-      {{ klass.id }}.find(id).not_nil!
+      {{ klass.id }}.find!(raw.to_i)
     end
   end
 end