Рефакторинг обработчиков. Часть 1 #21

src/handlers/admin/admin_handler_event_by_id.erl

@@ -15,73 +15,58 @@ init(Req, _Opts) ->
     <<"GET">>    -> get_event(Req);
     <<"PUT">>    -> update_event(Req);
     <<"DELETE">> -> delete_event(Req);
-    _            -> send_error(Req, 405, <<"Method not allowed">>)
+    _            -> handler_utils:send_error(Req, 405, <<"Method not allowed">>)
   end.
 
 %%%===================================================================
-%%% Swagger / Trails metadata
+%%% Swagger metadata
 %%%===================================================================
 
 trails() ->
-  Path = <<"/v1/admin/events/:id">>,
   BaseParams = [
     #{
-      name => <<"id">>,
-      in => <<"path">>,
+      name        => <<"id">>,
+      in          => <<"path">>,
       description => <<"Event ID">>,
-      required => true,
-      schema => #{type => string}
+      required    => true,
+      schema      => #{type => string}
     }
   ],
   [
-    %% GET
-    #{
-      path => Path,
-      method => <<"GET">>,
-      handler => ?MODULE,
-      tags => [<<"Events: id">>],
+    #{  % GET
+      path        => <<"/v1/admin/events/:id">>,
+      method      => <<"GET">>,
       description => <<"Get event by ID (admin)">>,
-      parameters => BaseParams,
-      responses => #{
+      tags        => [<<"Events">>],
+      parameters  => BaseParams,
+      responses   => #{
         200 => #{
           description => <<"Event details">>,
-          content => #{
-            <<"application/json">> => #{
-              schema => event_schema()
-            }
-          }
+          content     => #{<<"application/json">> => #{schema => event_schema()}}
         }
       }
     },
-    %% PUT
-    #{
-      path => Path,
-      method => <<"PUT">>,
-      handler => ?MODULE,
-      tags => [<<"Events: id">>],
+    #{  % PUT
+      path        => <<"/v1/admin/events/:id">>,
+      method      => <<"PUT">>,
       description => <<"Update event (admin)">>,
-      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 => Path,
-      method => <<"DELETE">>,
-      handler => ?MODULE,
-      tags => [<<"Events: id">>],
+    #{  % DELETE
+      path        => <<"/v1/admin/events/:id">>,
+      method      => <<"DELETE">>,
       description => <<"Soft-delete event (admin)">>,
-      parameters => BaseParams,
-      responses => #{
+      tags        => [<<"Events">>],
+      parameters  => BaseParams,
+      responses   => #{
         200 => #{description => <<"Event status set to deleted">>}
       }
     }
@@ -89,52 +74,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">>]},
-      rating_avg => #{type => number, format => float},
-      rating_count => #{type => integer},
-      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}
     }
   }.
 
@@ -142,26 +130,24 @@ event_update_schema() ->
 %%% Internal functions
 %%%===================================================================
 
-%% GET /v1/admin/events/:id
 get_event(Req) ->
-  case auth_admin(Req) of
+  case handler_utils:auth_admin(Req) of
     {ok, _AdminId, Req1} ->
       EventId = cowboy_req:binding(id, Req1),
       case logic_event:get_event_admin(EventId) of
         {ok, Event} ->
-          send_json(Req1, 200, event_to_json(Event));
+          handler_utils:send_json(Req1, 200, handler_utils:event_to_json(Event));
         {error, not_found} ->
-          send_error(Req1, 404, <<"Event not found">>);
+          handler_utils:send_error(Req1, 404, <<"Event not found">>);
         {error, _} ->
-          send_error(Req1, 500, <<"Internal server error">>)
+          handler_utils:send_error(Req1, 500, <<"Internal server error">>)
       end;
     {error, Code, Msg, Req1} ->
-      send_error(Req1, Code, Msg)
+      handler_utils:send_error(Req1, Code, Msg)
   end.
 
-%% PUT /v1/admin/events/:id
 update_event(Req) ->
-  case auth_admin(Req) of
+  case handler_utils:auth_admin(Req) of
     {ok, _AdminId, Req1} ->
       EventId = cowboy_req:binding(id, Req1),
       {ok, Body, Req2} = cowboy_req:read_body(Req1),
@@ -171,171 +157,66 @@ update_event(Req) ->
           UpdatesWithTypes = convert_fields(Updates),
           case logic_event:update_event_admin(EventId, UpdatesWithTypes) of
             {ok, Event} ->
-              send_json(Req2, 200, event_to_json(Event));
+              handler_utils:send_json(Req2, 200, handler_utils:event_to_json(Event));
             {error, not_found} ->
-              send_error(Req2, 404, <<"Event not found">>);
+              handler_utils:send_error(Req2, 404, <<"Event not found">>);
             {error, _} ->
-              send_error(Req2, 500, <<"Internal server error">>)
+              handler_utils:send_error(Req2, 500, <<"Internal server error">>)
           end;
         _ ->
-          send_error(Req2, 400, <<"Invalid JSON">>)
+          handler_utils:send_error(Req2, 400, <<"Invalid JSON">>)
       catch
-        _:_ -> send_error(Req1, 400, <<"Invalid JSON format">>)
+        _:_ -> handler_utils:send_error(Req1, 400, <<"Invalid JSON format">>)
       end;
     {error, Code, Msg, Req1} ->
-      send_error(Req1, Code, Msg)
+      handler_utils:send_error(Req1, Code, Msg)
   end.
 
-%% DELETE /v1/admin/events/:id
 delete_event(Req) ->
-  case auth_admin(Req) of
+  case handler_utils:auth_admin(Req) of
     {ok, _AdminId, Req1} ->
       EventId = cowboy_req:binding(id, Req1),
       case logic_event:delete_event_admin(EventId) of
         {ok, _} ->
-          send_json(Req1, 200, #{status => <<"deleted">>});
+          handler_utils:send_json(Req1, 200, #{status => <<"deleted">>});
         {error, not_found} ->
-          send_error(Req1, 404, <<"Event not found">>);
+          handler_utils:send_error(Req1, 404, <<"Event not found">>);
         {error, _} ->
-          send_error(Req1, 500, <<"Internal server error">>)
+          handler_utils:send_error(Req1, 500, <<"Internal server error">>)
       end;
     {error, Code, Msg, Req1} ->
-      send_error(Req1, Code, Msg)
+      handler_utils:send_error(Req1, Code, Msg)
   end.
 
-%%--------------------------------------------------------------------
-%% Auth helpers
-%%--------------------------------------------------------------------
-
-auth_admin(Req) ->
-  case handler_auth:authenticate(Req) of
-    {ok, AdminId, Req1} ->
-      case admin_utils:is_admin(AdminId) of
-        true -> {ok, AdminId, Req1};
-        false -> {error, 403, <<"Admin access required">>, Req1}
-      end;
-    {error, Code, Msg, Req1} ->
-      {error, Code, Msg, Req1}
-  end.
-
-%%--------------------------------------------------------------------
-%% Field conversion (from binary keys/values to internal atoms)
-%%--------------------------------------------------------------------
-
 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}) ->
-  case parse_datetime(Val) of
+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}) ->
-  RuleJson = jsx:encode(Val),
-  {recurrence_rule, RuleJson};
+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.
-
-%%--------------------------------------------------------------------
-%% JSON / datetime helpers
-%%--------------------------------------------------------------------
-
-event_to_json(Event) ->
-  LocationJson = case Event#event.location of
-                   undefined -> null;
-                   #location{address = Addr, lat = Lat, lon = Lon} ->
-                     #{address => Addr, lat => Lat, lon => Lon}
-                 end,
-  RecurrenceJson = case Event#event.recurrence_rule of
-                     undefined -> null;
-                     Rule ->
-                       try jsx:decode(Rule, [return_maps]) of
-                         Map when is_map(Map) -> Map;
-                         _ -> null
-                       catch _:_ -> null
-                       end
-                   end,
-  #{
-    id => Event#event.id,
-    calendar_id => Event#event.calendar_id,
-    title => Event#event.title,
-    description => Event#event.description,
-    event_type => Event#event.event_type,
-    start_time => datetime_to_iso8601(Event#event.start_time),
-    duration => Event#event.duration,
-    recurrence => RecurrenceJson,
-    master_id => Event#event.master_id,
-    is_instance => Event#event.is_instance,
-    specialist_id => Event#event.specialist_id,
-    location => LocationJson,
-    tags => Event#event.tags,
-    capacity => Event#event.capacity,
-    online_link => Event#event.online_link,
-    status => Event#event.status,
-    rating_avg => Event#event.rating_avg,
-    rating_count => Event#event.rating_count,
-    created_at => datetime_to_iso8601(Event#event.created_at),
-    updated_at => datetime_to_iso8601(Event#event.updated_at)
-  }.
-
-datetime_to_iso8601({{Year, Month, Day}, {Hour, Minute, Second}}) ->
-  iolist_to_binary(
-    io_lib:format(
-      "~4..0B-~2..0B-~2..0BT~2..0B:~2..0B:~2..0BZ",
-      [Year, Month, Day, Hour, Minute, Second]
-    )
-  );
-datetime_to_iso8601(undefined) ->
-  undefined.
-
-parse_datetime(Str) ->
-  try
-    [DateStr, TimeStr] = string:split(Str, "T"),
-    TimeStrNoZ = string:trim(TimeStr, trailing, "Z"),
-    [YearStr, MonthStr, DayStr] = string:split(DateStr, "-", all),
-    [HourStr, MinuteStr, SecondStr] = string:split(TimeStrNoZ, ":", all),
-    Year = binary_to_integer(list_to_binary(YearStr)),
-    Month = binary_to_integer(list_to_binary(MonthStr)),
-    Day = binary_to_integer(list_to_binary(DayStr)),
-    Hour = binary_to_integer(list_to_binary(HourStr)),
-    Minute = binary_to_integer(list_to_binary(MinuteStr)),
-    Second = binary_to_integer(list_to_binary(SecondStr)),
-    {ok, {{Year, Month, Day}, {Hour, Minute, Second}}}
-  catch _:_ -> {error, invalid_format}
-  end.
-
-%%--------------------------------------------------------------------
-%% Response helpers
-%%--------------------------------------------------------------------
-
-send_json(Req, Status, Data) ->
-  Body = jsx:encode(Data),
-  Headers = #{<<"content-type">> => <<"application/json">>},
-  cowboy_req:reply(Status, Headers, Body, Req),
-  {ok, Body, []}.
-
-send_error(Req, Status, Message) ->
-  Body = jsx:encode(#{error => Message}),
-  cowboy_req:reply(Status, #{<<"content-type">> => <<"application/json">>}, Body, Req),
-  {ok, Body, []}.
+convert_field(Other)                      -> Other.