EventHub/EventHubBack
1
1
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

Fix /v1/admin/stats всегда пустые данные

Browse Source 
Добавлено поле с датой последнего логина пользователям и админам  #20
This commit is contained in:
Алексей Сабилин
2026-05-08 20:21:04 +03:00
parent 1132341b92
commit ecf68ee300
9 changed files with 82 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/records.hrl
View File

@@ -17,6 +17,7 @@
social_links :: [binary()] | undefined,
phone :: binary() | undefined,
preferences :: map() | undefined,
last_login :: calendar:datetime(),
created_at :: calendar:datetime(),
updated_at :: calendar:datetime()
}).
@@ -41,6 +42,7 @@
language :: binary() | undefined,
phone :: binary() | undefined,
preferences :: map() | undefined,
last_login :: calendar:datetime(),
created_at :: calendar:datetime(),
updated_at :: calendar:datetime()
}).

11
src/core/core_admin.erl
View File

@@ -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).

11
src/core/core_user.erl
View File

@@ -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} ->

2
src/eventhub_app.erl
View File

@@ -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]),

1
src/handlers/admin/admin_handler_login.erl
View File

@@ -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">> => #{

1
src/handlers/handler_login.erl
View File

@@ -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),

20
src/logic/logic_stats.erl
View File

@@ -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).

30
test/api/api_admin_tests.erl
View File

@@ -34,10 +34,34 @@ test() ->
end,
%% TEST 3: Admin stats (superadmin)
ct:pal(" TEST 3: Admin stats (superadmin)... "),
{ok, {{_, 200, _}, _, StatsResp1}} = httpc:request(get, {AdminURL ++ "/v1/admin/stats", [{"Authorization", "Bearer " ++ binary_to_list(AdminToken)}]}, [], []),
ct:pal(" TEST 3: Admin stats for role... "),
SuperadminToken = api_test_runner:login_custom_admin(?FALLBACK_ADMIN_SUPER_EMAIL, ?FALLBACK_ADMIN_SUPER_PASSWORD),
ModeratorToken = api_test_runner:login_custom_admin(?FALLBACK_ADMIN_MODER_EMAIL, ?FALLBACK_ADMIN_MODER_PASSWORD),
SupportToken = api_test_runner:login_custom_admin(?FALLBACK_ADMIN_SUPPORT_EMAIL, ?FALLBACK_ADMIN_SUPPORT_PASSWORD),
ct:pal(" Admin stats (superadmin)... "),
{ok, {{_, 200, _}, _, StatsResp1}} = httpc:request(get, {AdminURL ++ "/v1/admin/stats", [{"Authorization", "Bearer " ++ binary_to_list(SuperadminToken)}]}, [], []),
Stats1 = jsx:decode(list_to_binary(StatsResp1), [return_maps]),
ct:pal(" OK (keys: ~p)~n", [maps:keys(Stats1)]),
ct:pal(" OK (Stats 1: ~p)~n", [Stats1]),
map_size(Stats1) > 0,
ct:pal(" Admin stats (admin)... "),
{ok, {{_, 200, _}, _, StatsResp2}} = httpc:request(get, {AdminURL ++ "/v1/admin/stats", [{"Authorization", "Bearer " ++ binary_to_list(AdminToken)}]}, [], []),
Stats2 = jsx:decode(list_to_binary(StatsResp2), [return_maps]),
ct:pal(" OK (Stats 1: ~p)~n", [Stats2]),
map_size(Stats2) > 0,
ct:pal(" Admin stats (moderator)... "),
{ok, {{_, 200, _}, _, StatsResp3}} = httpc:request(get, {AdminURL ++ "/v1/admin/stats", [{"Authorization", "Bearer " ++ binary_to_list(ModeratorToken)}]}, [], []),
Stats3 = jsx:decode(list_to_binary(StatsResp3), [return_maps]),
ct:pal(" OK (Stats 1: ~p)~n", [Stats3]),
map_size(Stats3) > 0,
ct:pal(" Admin stats (support)... "),
{ok, {{_, 200, _}, _, StatsResp4}} = httpc:request(get, {AdminURL ++ "/v1/admin/stats", [{"Authorization", "Bearer " ++ binary_to_list(SupportToken)}]}, [], []),
Stats4 = jsx:decode(list_to_binary(StatsResp4), [return_maps]),
ct:pal(" OK (Stats 1: ~p)~n", [Stats4]),
map_size(Stats4) > 0,
%% TEST 4: List users
ct:pal(" TEST 4: List users... "),

10
test/api/api_test_runner.erl
View File

@@ -3,7 +3,7 @@
-export([http_post/2, http_post/3, http_get/1, http_get/2, http_put/3, http_delete/2]).
-export([extract_json/2, extract_json/3, assert_status/2]).
-export([unique_email/1, register_and_login/2, create_calendar/2, create_event/3]).
-export([get_admin_token/0, get_admin_id/0, get_user_token/0, get_user_id/0, get_admin_url/0, get_base_url/0, get_admin_ws_url/0, get_base_ws_url/0]).
-export([get_admin_token/0, get_admin_id/0, get_user_token/0, get_user_id/0, get_admin_url/0, get_base_url/0, get_admin_ws_url/0, get_base_ws_url/0, login_admin/2, login_custom_admin/2]).
-export([wait_for_server/0]).
-export([format_datetime/1]).
@@ -243,6 +243,14 @@ register_and_login(Email, Password) ->
maps:get(<<"token">>, Map)
end.
login_custom_admin(Email, Password) ->
%% LoginBody = #{email => Email, password => Password},
LoginBody = jsx:encode(#{<<"email">> => Email, <<"password">> => Password}),
{ok, {{_, _, _}, _, LoginResp}} = httpc:request(post,
{?ADMIN_URL ++ "/v1/admin/login", [], "application/json", LoginBody}, ssl_opts(), []),
Map = jsx:decode(list_to_binary(LoginResp), [return_maps]),
maps:get(<<"token">>, Map).
create_calendar(Token, Params) ->
Response = http_post("/v1/calendars", Params, Token),
ct:pal(" create_calendar Response: ~p~n", [Response]),