Fix /v1/admin/stats всегда пустые данные
Добавлено поле с датой последнего логина пользователям и админам #20
This commit is contained in:
+10
-1
@@ -1,7 +1,7 @@
|
||||
-module(core_admin).
|
||||
-include("records.hrl").
|
||||
-export([create/3, get_by_email/1, get_by_id/1, list_all/0,
|
||||
update_role/2, block/1, unblock/1, generate_id/0]).
|
||||
update_role/2, block/1, unblock/1, generate_id/0, update_last_login/1]).
|
||||
|
||||
create(Email, Password, Role) ->
|
||||
case get_by_email(Email) of
|
||||
@@ -49,6 +49,15 @@ update_role(Id, NewRole) when is_atom(NewRole) ->
|
||||
Error -> Error
|
||||
end.
|
||||
|
||||
update_last_login(Id) ->
|
||||
case get_by_id(Id) of
|
||||
{ok, Admin} ->
|
||||
Updated = Admin#admin{last_login = calendar:universal_time()},
|
||||
mnesia:dirty_write(Updated),
|
||||
{ok, Updated};
|
||||
Error -> Error
|
||||
end.
|
||||
|
||||
block(Id) ->
|
||||
update_status(Id, blocked).
|
||||
|
||||
|
||||
+10
-1
@@ -1,7 +1,7 @@
|
||||
-module(core_user).
|
||||
-include("records.hrl").
|
||||
|
||||
-export([create/2, get_by_id/1, get_by_email/1, update/2, update_status/3, delete/1]).
|
||||
-export([create/2, get_by_id/1, get_by_email/1, update/2, update_status/3, delete/1, update_last_login/1]).
|
||||
-export([email_exists/1]).
|
||||
-export([generate_id/0]).
|
||||
-export([list_users/0]).
|
||||
@@ -80,6 +80,15 @@ update(Id, Updates) ->
|
||||
{aborted, Reason} -> {error, Reason}
|
||||
end.
|
||||
|
||||
update_last_login(Id) ->
|
||||
case get_by_id(Id) of
|
||||
{ok, User} ->
|
||||
Updated = User#user{last_login = calendar:universal_time()},
|
||||
mnesia:dirty_write(Updated),
|
||||
{ok, Updated};
|
||||
Error -> Error
|
||||
end.
|
||||
|
||||
update_status(Id, Status, Reason) ->
|
||||
case get_by_id(Id) of
|
||||
{ok, User} ->
|
||||
|
||||
@@ -158,7 +158,7 @@ init_default_admins() ->
|
||||
case core_admin:list_all() of
|
||||
[] ->
|
||||
% Суперадмин
|
||||
SuperEmail = list_to_binary(os:getenv("ADMIN_SUPER_EMAIL", "superadmin2@eventhub.local")),
|
||||
SuperEmail = list_to_binary(os:getenv("ADMIN_SUPER_EMAIL", "superadmin@eventhub.local")),
|
||||
SuperPass = list_to_binary(os:getenv("ADMIN_SUPER_PASSWORD", "123456")),
|
||||
{ok, _} = core_admin:create(SuperEmail, SuperPass, superadmin),
|
||||
io:format("Default superadmin created: ~s~n", [SuperEmail]),
|
||||
|
||||
@@ -16,6 +16,7 @@ init(Req0, State) ->
|
||||
{RefreshToken, _ExpiresAt} = eventhub_auth:generate_refresh_token(maps:get(id, User)),
|
||||
% Сохранение refresh-токена в admin_session
|
||||
core_admin_session:create(maps:get(id, User), RefreshToken),
|
||||
core_admin:update_last_login(maps:get(id, User)),
|
||||
Resp = jsx:encode(#{
|
||||
<<"token">> => Token,
|
||||
<<"user">> => #{
|
||||
|
||||
@@ -23,6 +23,7 @@ handle(Req, _Opts) ->
|
||||
{ok, Token, User} ->
|
||||
{RefreshToken, _ExpiresAt} = eventhub_auth:generate_refresh_token(maps:get(id, User)),
|
||||
core_session:create(maps:get(id, User), RefreshToken),
|
||||
core_user:update_last_login(maps:get(id, User)),
|
||||
Response = #{
|
||||
user => #{
|
||||
id => maps:get(id, User),
|
||||
|
||||
@@ -16,6 +16,8 @@ get_stats(Role, AdminId) ->
|
||||
From :: calendar:datetime(), To :: calendar:datetime()) -> map().
|
||||
get_stats(superadmin, _AdminId, From, To) ->
|
||||
build_superadmin_stats(From, To);
|
||||
get_stats(admin, _AdminId, From, To) ->
|
||||
build_admin_stats(From, To);
|
||||
get_stats(moderator, AdminId, From, To) ->
|
||||
build_moderator_stats(AdminId, From, To);
|
||||
get_stats(support, AdminId, From, To) ->
|
||||
@@ -39,6 +41,21 @@ build_superadmin_stats(From, To) ->
|
||||
admin_activity => collect_admin_activity()
|
||||
}.
|
||||
|
||||
%% ========== Админ =========================================
|
||||
build_admin_stats(From, To) ->
|
||||
#{
|
||||
users_total => core_user:count_users(),
|
||||
events_total => core_event:count_events(),
|
||||
calendars_total => core_calendar:count_calendars(),
|
||||
reviews_total => core_review:count_reviews(),
|
||||
reports_total => core_report:count_reports_by_status(pending),
|
||||
tickets_open => core_ticket:count_tickets_by_status(open),
|
||||
tickets_total => length(core_ticket:list_all()),
|
||||
avg_ticket_resolution_h => trunc_hours(core_ticket:avg_resolution_time()),
|
||||
registrations_by_day => date_list_to_json(core_user:count_users_by_date(From, To)),
|
||||
events_by_day => date_list_to_json(core_event:count_events_by_date(From, To))
|
||||
}.
|
||||
|
||||
%% ========== Модератор ==========================================
|
||||
build_moderator_stats(AdminId, _From, _To) ->
|
||||
#{
|
||||
@@ -76,7 +93,10 @@ collect_admin_activity() ->
|
||||
Actions = length(core_admin_audit:list([{admin_id, A#admin.id}])),
|
||||
#{
|
||||
admin_id => A#admin.id,
|
||||
nickname => A#admin.nickname,
|
||||
email => A#admin.email,
|
||||
role => A#admin.role,
|
||||
last_login => A#admin.last_login,
|
||||
actions => Actions
|
||||
}
|
||||
end, Admins).
|
||||
end, Admins).
|
||||
Reference in New Issue
Block a user