From 46c64f9cb52580c3af4ab7199eec24a8e430a7e1 Mon Sep 17 00:00:00 2001 From: Dominic Grimm Date: Tue, 8 Mar 2022 09:44:33 +0100 Subject: [PATCH] Updated API DB oriented models' init functions --- docker/backend/src/backend/api/schema/helpers.cr | 4 ++-- docker/backend/src/backend/api/schema/query.cr | 2 +- docker/backend/src/backend/ldap/user.cr | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docker/backend/src/backend/api/schema/helpers.cr b/docker/backend/src/backend/api/schema/helpers.cr index 513473d..7d29ba9 100644 --- a/docker/backend/src/backend/api/schema/helpers.cr +++ b/docker/backend/src/backend/api/schema/helpers.cr @@ -36,8 +36,8 @@ module Backend def initialize(@model : {{ type }}) end - def initialize(id : Int32) - @model = {{ type }}.find!(id) + def self.from_id(id : Int32) : self + new({{ type }}.find!(id)) end {% space_name = type.names.last.underscore.gsub(/_/, " ").capitalize %} diff --git a/docker/backend/src/backend/api/schema/query.cr b/docker/backend/src/backend/api/schema/query.cr index a0de467..062e028 100644 --- a/docker/backend/src/backend/api/schema/query.cr +++ b/docker/backend/src/backend/api/schema/query.cr @@ -38,7 +38,7 @@ module Backend def user(context : Context, id : Int32) : User context.admin! - User.new(id) + User.from_id(id) end @[GraphQL::Field] diff --git a/docker/backend/src/backend/ldap/user.cr b/docker/backend/src/backend/ldap/user.cr index 692831e..a5bb5e3 100644 --- a/docker/backend/src/backend/ldap/user.cr +++ b/docker/backend/src/backend/ldap/user.cr @@ -76,7 +76,7 @@ module Backend end # Creates user data from DB entry index - def self.from_index(id : Int32) : self + def self.from_id(id : Int32) : self from_db(Db::User.find!(id)) end end -- 2.43.0