Рефакторинг админских обработчиков - пагинация, сортировка, фильтрация. Часть 1

2026-05-26 13:04:31 +03:00
parent 01dbc6d6cb
commit ed5b275efb
24 changed files with 1009 additions and 1126 deletions
@@ -1,6 +1,13 @@
+%%%-------------------------------------------------------------------
+%%% @doc Административный обработчик для операций с одним событием.
+%%% Эндпоинты:
+%%%   GET    /v1/admin/events/:id
+%%%   PUT    /v1/admin/events/:id
+%%%   DELETE /v1/admin/events/:id
+%%% @end
+%%%-------------------------------------------------------------------
 -module(admin_handler_event_by_id).
 -behaviour(cowboy_handler).
-
 -export([init/2]).
 -export([trails/0]).

@@ -9,64 +16,53 @@
 %%%===================================================================
 %%% cowboy_handler callback
 %%%===================================================================
-
 init(Req, _Opts) ->
  case cowboy_req:method(Req) of
-    <<"GET">>    -> get_event(Req);
-    <<"PUT">>    -> update_event(Req);
+    <<"GET">> -> get_event(Req);
+    <<"PUT">> -> update_event(Req);
    <<"DELETE">> -> delete_event(Req);
-    _            -> handler_utils:send_error(Req, 405, <<"Method not allowed">>)
+    _ -> handler_utils:send_error(Req, 405, <<"Method not allowed">>)
  end.

 %%%===================================================================
 %%% Swagger metadata
 %%%===================================================================
-
 trails() ->
  BaseParams = [
-    #{
-      name        => <<"id">>,
-      in          => <<"path">>,
-      description => <<"Event ID">>,
-      required    => true,
-      schema      => #{type => string}
-    }
+    #{name => <<"id">>, in => <<"path">>, description => <<"Event ID">>, required => true, schema => #{type => string}}
  ],
  [
-    #{  % GET
-      path        => <<"/v1/admin/events/:id">>,
-      method      => <<"GET">>,
+    #{ % GET
+      path => <<"/v1/admin/events/:id">>,
+      method => <<"GET">>,
      description => <<"Get event by ID (admin)">>,
-      tags        => [<<"Events">>],
-      parameters  => BaseParams,
-      responses   => #{
-        200 => #{
-          description => <<"Event details">>,
-          content     => #{<<"application/json">> => #{schema => event_schema()}}
-        }
+      tags => [<<"Events">>],
+      parameters => BaseParams,
+      responses => #{
+        200 => #{description => <<"Event details">>, content => #{<<"application/json">> => #{schema => event_schema()}}}
      }
    },
-    #{  % PUT
-      path        => <<"/v1/admin/events/:id">>,
-      method      => <<"PUT">>,
+    #{ % PUT
+      path => <<"/v1/admin/events/:id">>,
+      method => <<"PUT">>,
      description => <<"Update event (admin)">>,
-      tags        => [<<"Events">>],
-      parameters  => BaseParams,
+      tags => [<<"Events">>],
+      parameters => BaseParams,
      requestBody => #{
        required => true,
-        content  => #{<<"application/json">> => #{schema => event_update_schema()}}
+        content => #{<<"application/json">> => #{schema => event_update_schema()}}
      },
-      responses   => #{
+      responses => #{
        200 => #{description => <<"Updated event">>}
      }
    },
-    #{  % DELETE
-      path        => <<"/v1/admin/events/:id">>,
-      method      => <<"DELETE">>,
+    #{ % DELETE
+      path => <<"/v1/admin/events/:id">>,
+      method => <<"DELETE">>,
      description => <<"Soft-delete event (admin)">>,
-      tags        => [<<"Events">>],
-      parameters  => BaseParams,
-      responses   => #{
+      tags => [<<"Events">>],
+      parameters => BaseParams,
+      responses => #{
        200 => #{description => <<"Event status set to deleted">>}
      }
    }
@@ -74,55 +70,55 @@ trails() ->

 event_schema() ->
  #{
-    type       => object,
+    type => object,
    properties => #{
-      id              => #{type => string},
-      calendar_id     => #{type => string},
-      title           => #{type => string},
-      description     => #{type => string},
-      event_type      => #{type => string, enum => [<<"single">>, <<"recurring">>]},
-      start_time      => #{type => string, format => <<"date-time">>},
-      duration        => #{type => integer},
-      recurrence      => #{type => object, nullable => true},
-      master_id       => #{type => string, nullable => true},
-      is_instance     => #{type => boolean},
-      specialist_id   => #{type => string, nullable => true},
-      location        => #{type => object, nullable => true},
-      tags            => #{type => array, items => #{type => string}},
-      capacity        => #{type => integer, nullable => true},
-      online_link     => #{type => string, nullable => true},
-      status          => #{type => string, enum => [<<"active">>, <<"cancelled">>, <<"completed">>]},
-      reason          => #{type => string, nullable => true},
-      rating_avg      => #{type => number, format => float},
-      rating_count    => #{type => integer},
-      attachments     => #{type => array, items => #{type => string}, nullable => true},
-      edit_history    => #{type => array, items => #{type => object}, nullable => true},
-      created_at      => #{type => string, format => <<"date-time">>},
-      updated_at      => #{type => string, format => <<"date-time">>}
+      id => #{type => string},
+      calendar_id => #{type => string},
+      title => #{type => string},
+      description => #{type => string},
+      event_type => #{type => string, enum => [<<"single">>, <<"recurring">>]},
+      start_time => #{type => string, format => <<"date-time">>},
+      duration => #{type => integer},
+      recurrence => #{type => object, nullable => true},
+      master_id => #{type => string, nullable => true},
+      is_instance => #{type => boolean},
+      specialist_id => #{type => string, nullable => true},
+      location => #{type => object, nullable => true},
+      tags => #{type => array, items => #{type => string}},
+      capacity => #{type => integer, nullable => true},
+      online_link => #{type => string, nullable => true},
+      status => #{type => string, enum => [<<"active">>, <<"cancelled">>, <<"completed">>]},
+      reason => #{type => string, nullable => true},
+      rating_avg => #{type => number, format => float},
+      rating_count => #{type => integer},
+      attachments => #{type => array, items => #{type => string}, nullable => true},
+      edit_history => #{type => array, items => #{type => object}, nullable => true},
+      created_at => #{type => string, format => <<"date-time">>},
+      updated_at => #{type => string, format => <<"date-time">>}
    }
  }.

 event_update_schema() ->
  #{
-    type       => object,
+    type => object,
    properties => #{
-      title         => #{type => string},
-      description   => #{type => string},
-      start_time    => #{type => string, format => <<"date-time">>},
-      duration      => #{type => integer},
-      status        => #{type => string, enum => [<<"active">>, <<"cancelled">>, <<"completed">>]},
+      title => #{type => string},
+      description => #{type => string},
+      start_time => #{type => string, format => <<"date-time">>},
+      duration => #{type => integer},
+      status => #{type => string, enum => [<<"active">>, <<"cancelled">>, <<"completed">>]},
      specialist_id => #{type => string},
-      location      => #{
-        type       => object,
+      location => #{
+        type => object,
        properties => #{
          address => #{type => string},
-          lat     => #{type => number, format => float},
-          lon     => #{type => number, format => float}
+          lat => #{type => number, format => float},
+          lon => #{type => number, format => float}
        }
      },
-      tags          => #{type => array, items => #{type => string}},
-      capacity      => #{type => integer},
-      online_link   => #{type => string}
+      tags => #{type => array, items => #{type => string}},
+      capacity => #{type => integer},
+      online_link => #{type => string}
    }
  }.

@@ -148,7 +144,7 @@ get_event(Req) ->

 update_event(Req) ->
  case handler_utils:auth_admin(Req) of
-    {ok, _AdminId, Req1} ->
+    {ok, AdminId, Req1} ->
      EventId = cowboy_req:binding(id, Req1),
      {ok, Body, Req2} = cowboy_req:read_body(Req1),
      try jsx:decode(Body, [return_maps]) of
@@ -157,6 +153,8 @@ update_event(Req) ->
          UpdatesWithTypes = convert_fields(Updates),
          case logic_event:update_event_admin(EventId, UpdatesWithTypes) of
            {ok, Event} ->
+              % Аудит обновления события
+              admin_utils:log_admin_action(AdminId, <<"update_event">>, <<"event">>, EventId, Req2),
              handler_utils:send_json(Req2, 200, handler_utils:event_to_json(Event));
            {error, not_found} ->
              handler_utils:send_error(Req2, 404, <<"Event not found">>);
@@ -174,10 +172,12 @@ update_event(Req) ->

 delete_event(Req) ->
  case handler_utils:auth_admin(Req) of
-    {ok, _AdminId, Req1} ->
+    {ok, AdminId, Req1} ->
      EventId = cowboy_req:binding(id, Req1),
      case logic_event:delete_event_admin(EventId) of
        {ok, _} ->
+          % Аудит удаления события
+          admin_utils:log_admin_action(AdminId, <<"delete_event">>, <<"event">>, EventId, Req1),
          handler_utils:send_json(Req1, 200, #{status => <<"deleted">>});
        {error, not_found} ->
          handler_utils:send_error(Req1, 404, <<"Event not found">>);
@@ -188,35 +188,39 @@ delete_event(Req) ->
      handler_utils:send_error(Req1, Code, Msg)
  end.

+%%%===================================================================
+%%% Вспомогательные функции
+%%%===================================================================
+
 convert_fields(Updates) ->
  lists:map(fun convert_field/1, Updates).

-convert_field({<<"title">>, Val})         -> {title, Val};
-convert_field({<<"description">>, Val})   -> {description, Val};
-convert_field({<<"event_type">>, Val})    -> {event_type, Val};
-convert_field({<<"start_time">>, Val})    ->
+convert_field({<<"title">>, Val}) -> {title, Val};
+convert_field({<<"description">>, Val}) -> {description, Val};
+convert_field({<<"event_type">>, Val}) -> {event_type, Val};
+convert_field({<<"start_time">>, Val}) ->
  case handler_utils:parse_datetime(Val) of
    {ok, Dt} -> {start_time, Dt};
-    _        -> {start_time, Val}
+    _ -> {start_time, Val}
  end;
-convert_field({<<"duration">>, Val})      -> {duration, Val};
-convert_field({<<"recurrence">>, Val})    -> {recurrence_rule, jsx:encode(Val)};
+convert_field({<<"duration">>, Val}) -> {duration, Val};
+convert_field({<<"recurrence">>, Val}) -> {recurrence_rule, jsx:encode(Val)};
 convert_field({<<"specialist_id">>, Val}) -> {specialist_id, Val};
 convert_field({<<"location">>, Val}) when is_map(Val) ->
  Loc = #location{
    address = maps:get(<<"address">>, Val, undefined),
-    lat     = maps:get(<<"lat">>, Val, undefined),
-    lon     = maps:get(<<"lon">>, Val, undefined)
+    lat = maps:get(<<"lat">>, Val, undefined),
+    lon = maps:get(<<"lon">>, Val, undefined)
  },
  {location, Loc};
-convert_field({<<"location">>, Val})      -> {location, Val};
-convert_field({<<"tags">>, Val})          -> {tags, Val};
-convert_field({<<"capacity">>, Val})      -> {capacity, Val};
-convert_field({<<"online_link">>, Val})   -> {online_link, Val};
-convert_field({<<"status">>, Val})        ->
+convert_field({<<"location">>, Val}) -> {location, Val};
+convert_field({<<"tags">>, Val}) -> {tags, Val};
+convert_field({<<"capacity">>, Val}) -> {capacity, Val};
+convert_field({<<"online_link">>, Val}) -> {online_link, Val};
+convert_field({<<"status">>, Val}) ->
  try binary_to_existing_atom(Val, utf8) of
    Atom -> {status, Atom}
  catch
    error:badarg -> {status, Val}
  end;
-convert_field(Other)                      -> Other.
+convert_field(Other) -> Other.