From ecf68ee3000aa0f66b97f6049c07c17da37797e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9=20=D0=A1=D0=B0?= =?UTF-8?q?=D0=B1=D0=B8=D0=BB=D0=B8=D0=BD?= Date: Fri, 8 May 2026 20:21:04 +0300 Subject: [PATCH] =?UTF-8?q?Fix=20/v1/admin/stats=20=D0=B2=D1=81=D0=B5?= =?UTF-8?q?=D0=B3=D0=B4=D0=B0=20=D0=BF=D1=83=D1=81=D1=82=D1=8B=D0=B5=20?= =?UTF-8?q?=D0=B4=D0=B0=D0=BD=D0=BD=D1=8B=D0=B5=20=D0=94=D0=BE=D0=B1=D0=B0?= =?UTF-8?q?=D0=B2=D0=BB=D0=B5=D0=BD=D0=BE=20=D0=BF=D0=BE=D0=BB=D0=B5=20?= =?UTF-8?q?=D1=81=20=D0=B4=D0=B0=D1=82=D0=BE=D0=B9=20=D0=BF=D0=BE=D1=81?= =?UTF-8?q?=D0=BB=D0=B5=D0=B4=D0=BD=D0=B5=D0=B3=D0=BE=20=D0=BB=D0=BE=D0=B3?= =?UTF-8?q?=D0=B8=D0=BD=D0=B0=20=D0=BF=D0=BE=D0=BB=D1=8C=D0=B7=D0=BE=D0=B2?= =?UTF-8?q?=D0=B0=D1=82=D0=B5=D0=BB=D1=8F=D0=BC=20=D0=B8=20=D0=B0=D0=B4?= =?UTF-8?q?=D0=BC=D0=B8=D0=BD=D0=B0=D0=BC=20=20https://git.sabilin.com/Eve?= =?UTF-8?q?ntHub/EventHubBack/issues/20?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- include/records.hrl | 2 ++ src/core/core_admin.erl | 11 +++++++- src/core/core_user.erl | 11 +++++++- src/eventhub_app.erl | 2 +- src/handlers/admin/admin_handler_login.erl | 1 + src/handlers/handler_login.erl | 1 + src/logic/logic_stats.erl | 22 +++++++++++++++- test/api/api_admin_tests.erl | 30 +++++++++++++++++++--- test/api/api_test_runner.erl | 10 +++++++- 9 files changed, 82 insertions(+), 8 deletions(-) diff --git a/include/records.hrl b/include/records.hrl index a069897..b856103 100644 --- a/include/records.hrl +++ b/include/records.hrl @@ -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() }). diff --git a/src/core/core_admin.erl b/src/core/core_admin.erl index 4a6bf1e..cb914fd 100644 --- a/src/core/core_admin.erl +++ b/src/core/core_admin.erl @@ -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). diff --git a/src/core/core_user.erl b/src/core/core_user.erl index 371afd5..f385595 100644 --- a/src/core/core_user.erl +++ b/src/core/core_user.erl @@ -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} -> diff --git a/src/eventhub_app.erl b/src/eventhub_app.erl index ea6adbe..6e12767 100644 --- a/src/eventhub_app.erl +++ b/src/eventhub_app.erl @@ -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]), diff --git a/src/handlers/admin/admin_handler_login.erl b/src/handlers/admin/admin_handler_login.erl index 1072748..2fe67ca 100644 --- a/src/handlers/admin/admin_handler_login.erl +++ b/src/handlers/admin/admin_handler_login.erl @@ -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">> => #{ diff --git a/src/handlers/handler_login.erl b/src/handlers/handler_login.erl index 1122b39..0dda64f 100644 --- a/src/handlers/handler_login.erl +++ b/src/handlers/handler_login.erl @@ -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), diff --git a/src/logic/logic_stats.erl b/src/logic/logic_stats.erl index fdc762a..1848ed6 100644 --- a/src/logic/logic_stats.erl +++ b/src/logic/logic_stats.erl @@ -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). \ No newline at end of file + end, Admins). \ No newline at end of file diff --git a/test/api/api_admin_tests.erl b/test/api/api_admin_tests.erl index 0ed429c..224c7c7 100644 --- a/test/api/api_admin_tests.erl +++ b/test/api/api_admin_tests.erl @@ -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... "), diff --git a/test/api/api_test_runner.erl b/test/api/api_test_runner.erl index 7c6cb42..53b2ca5 100644 --- a/test/api/api_test_runner.erl +++ b/test/api/api_test_runner.erl @@ -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]),