Ролевая модель и аудит Часть 1.

src/handlers/admin/admin_handler_user_by_id.erl

@@ -1,28 +1,22 @@
 -module(admin_handler_user_by_id).
 -include("records.hrl").
 -export([init/2]).
--export([user_to_json/1, convert_updates/1]).
 
-init(Req, Opts) ->
-  handle(Req, Opts).
-
-handle(Req, _Opts) ->
+init(Req, _Opts) ->
   case cowboy_req:method(Req) of
-    <<"GET">>    -> get_user(Req);
-    <<"PUT">>    -> update_user(Req);
+    <<"GET">> -> get_user(Req);
+    <<"PUT">> -> update_user(Req);
     <<"DELETE">> -> delete_user(Req);
-    _            -> send_error(Req, 405, <<"Method not allowed">>)
+    _ -> send_error(Req, 405, <<"Method not allowed">>)
   end.
 
 get_user(Req) ->
   case handler_auth:authenticate(Req) of
     {ok, AdminId, Req1} ->
-      case is_admin(AdminId) of
+      case admin_utils:is_admin(AdminId) of
         true ->
           UserId = cowboy_req:binding(id, Req1),
           case core_user:get_by_id(UserId) of
-            {ok, User} when User#user.status =:= deleted ->
-              send_error(Req1, 404, <<"User not found">>);
             {ok, User} ->
               send_json(Req1, 200, user_to_json(User));
             {error, not_found} ->
@@ -38,7 +32,7 @@ get_user(Req) ->
 update_user(Req) ->
   case handler_auth:authenticate(Req) of
     {ok, AdminId, Req1} ->
-      case is_admin(AdminId) of
+      case admin_utils:is_admin(AdminId) of
         true ->
           UserId = cowboy_req:binding(id, Req1),
           {ok, Body, Req2} = cowboy_req:read_body(Req1),
@@ -69,7 +63,7 @@ update_user(Req) ->
 delete_user(Req) ->
   case handler_auth:authenticate(Req) of
     {ok, AdminId, Req1} ->
-      case is_admin(AdminId) of
+      case admin_utils:is_admin(AdminId) of
         true ->
           UserId = cowboy_req:binding(id, Req1),
           case core_user:delete(UserId) of
@@ -85,12 +79,6 @@ delete_user(Req) ->
       send_error(Req1, Code, Message)
   end.
 
-is_admin(UserId) ->
-  case core_user:get_by_id(UserId) of
-    {ok, User} -> User#user.role =:= admin;
-    _ -> false
-  end.
-
 user_to_json(User) ->
   #{
     id         => User#user.id,