fix(backend): IP в аудите, closed_at тикетов и admin_activity в статистике. Refs EventHub/EventHubBack#27 #28 #29

src/logic/logic_stats.erl

@@ -148,9 +148,60 @@ trunc_hours(Hours) ->
   round(Hours * 100) / 100.
 
 %%%-------------------------------------------------------------------
-%%% @doc Сбор активности администраторов (заглушка).
+%%% @doc Сбор активности администраторов из записей аудита.
 %%% @end
 %%%-------------------------------------------------------------------
 -spec collect_admin_activity() -> [map()].
 collect_admin_activity() ->
-  [].
+  Audits = core_admin_audit:list(),
+  Grouped = group_audit_by_admin(Audits),
+  Activity = maps:fold(fun build_admin_activity_entry/3, [], Grouped),
+  lists:sort(fun sort_by_actions_desc/2, Activity).
+
+group_audit_by_admin(Audits) ->
+  lists:foldl(fun aggregate_audit_entry/2, #{}, Audits).
+
+aggregate_audit_entry(#admin_audit{admin_id = AdminId, action = Action, timestamp = Ts}, Acc) ->
+  Entry = maps:get(AdminId, Acc, #{actions => 0, last_login => undefined}),
+  Actions = maps:get(actions, Entry) + 1,
+  LastLogin = case Action of
+                <<"login">> -> latest_datetime(maps:get(last_login, Entry), Ts);
+                _ -> maps:get(last_login, Entry)
+              end,
+  maps:put(AdminId, #{actions => Actions, last_login => LastLogin}, Acc).
+
+build_admin_activity_entry(AdminId, #{actions := Actions, last_login := LastLogin}, Acc) ->
+  case core_admin:get_by_id(AdminId) of
+    {ok, Admin} ->
+      [#{
+        <<"admin_id">>   => AdminId,
+        <<"email">>      => Admin#admin.email,
+        <<"nickname">>   => Admin#admin.nickname,
+        <<"role">>       => atom_to_binary(Admin#admin.role, utf8),
+        <<"actions">>    => Actions,
+        <<"last_login">> => format_datetime(maybe_last_login(LastLogin, Admin#admin.last_login))
+      } | Acc];
+    _ ->
+      Acc
+  end.
+
+maybe_last_login(undefined, AdminLastLogin) -> AdminLastLogin;
+maybe_last_login(LoginFromAudit, _) -> LoginFromAudit.
+
+latest_datetime(undefined, Ts) -> Ts;
+latest_datetime(Existing, Ts) ->
+  case calendar:datetime_to_gregorian_seconds(Ts) >=
+       calendar:datetime_to_gregorian_seconds(Existing) of
+    true -> Ts;
+    false -> Existing
+  end.
+
+sort_by_actions_desc(#{<<"actions">> := A}, #{<<"actions">> := B}) ->
+  A >= B.
+
+format_datetime(undefined) -> <<"">>;
+format_datetime(Bin) when is_binary(Bin) -> Bin;
+format_datetime({{Y, M, D}, {H, Mi, S}}) ->
+  iolist_to_binary(
+    io_lib:format("~4..0B-~2..0B-~2..0BT~2..0B:~2..0B:~2..0BZ",
+      [Y, M, D, H, Mi, S])).

src/logic/logic_ticket.erl

@@ -26,7 +26,10 @@ report_error(ErrorMessage, Stacktrace, Context) ->
       mnesia:dirty_write(Updated),
       {ok, Updated};
     [] ->
+      ReporterId = maps:get(<<"reporter_id">>, Context,
+        maps:get(reporter_id, Context, <<"anonymous">>)),
       Data = #{
+        <<"reporter_id">> => ReporterId,
         <<"error_message">> => ErrorMessage,
         <<"stacktrace">> => Stacktrace,
         <<"context">> => list_to_binary(io_lib:format("~p", [Context]))
@@ -75,6 +78,8 @@ list_tickets_by_status(AdminId, Status) ->
   end.
 
 %% Обновить статус тикета
+update_status(AdminId, TicketId, closed) ->
+  close_ticket(AdminId, TicketId);
 update_status(AdminId, TicketId, Status) ->
   case admin_utils:is_admin(AdminId) of
     true  -> core_ticket:update_ticket(TicketId, #{<<"status">> => Status});
@@ -94,7 +99,8 @@ resolve_ticket(AdminId, TicketId, ResolutionNote) ->
     true  ->
       core_ticket:update_ticket(TicketId, #{
         <<"status">> => <<"resolved">>,
-        <<"resolution_note">> => ResolutionNote
+        <<"resolution_note">> => ResolutionNote,
+        <<"closed_at">> => calendar:universal_time()
       });
     false -> {error, access_denied}
   end.
@@ -102,7 +108,7 @@ resolve_ticket(AdminId, TicketId, ResolutionNote) ->
 %% Закрыть тикет
 close_ticket(AdminId, TicketId) ->
   case admin_utils:is_admin(AdminId) of
-    true  -> core_ticket:update_ticket(TicketId, #{<<"status">> => <<"closed">>});
+    true  -> core_ticket:close(TicketId, AdminId);
     false -> {error, access_denied}
   end.