Skip to content

Migrate UsageStatisticsDb #13494

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mingyuancode merged 1 commit into from
Feb 4, 2026
Merged

Migrate UsageStatisticsDb #13494

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions .github/workflows/axe.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,12 @@ on:
branches:
- master
- release
- V9-clean-slate-sql
pull_request:
branches:
- master
- release
- V9-clean-slate-sql
workflow_dispatch:

jobs:
axe-testing:
runs-on: ubuntu-latest
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/e2e-sql.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ on:
schedule:
- cron: "0 0 * * *" #end of every day
workflow_dispatch:

jobs:
E2E-sql-testing:
runs-on: ubuntu-latest
Expand Down
12 changes: 5 additions & 7 deletions src/main/java/teammates/ui/webapi/CalculateUsageStatisticsAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
import java.time.Instant;
import java.time.temporal.ChronoUnit;

import teammates.common.datatransfer.attributes.UsageStatisticsAttributes;
import teammates.common.datatransfer.logs.LogEvent;
import teammates.common.exception.EntityAlreadyExistsException;
import teammates.common.exception.InvalidParametersException;
Expand All @@ -24,7 +23,6 @@ public JsonResult execute() {
Instant endTime = TimeHelper.getInstantNearestHourBefore(Instant.now());
Instant startTime = endTime.minus(COLLECTION_TIME_PERIOD, ChronoUnit.MINUTES);

UsageStatisticsAttributes entitiesStats = logic.calculateEntitiesStatisticsForTimeRange(startTime, endTime);
UsageStatistics sqlEntitiesStats = sqlLogic.calculateEntitiesStatisticsForTimeRange(startTime, endTime);

int numEmailsSent = logsProcessor.getNumberOfLogsForEvent(startTime, endTime, LogEvent.EMAIL_SENT, "");
Expand All @@ -33,11 +31,11 @@ public JsonResult execute() {

UsageStatistics overallUsageStats = new UsageStatistics(
startTime, COLLECTION_TIME_PERIOD,
entitiesStats.getNumResponses() + sqlEntitiesStats.getNumResponses(),
entitiesStats.getNumCourses() + sqlEntitiesStats.getNumCourses(),
entitiesStats.getNumStudents() + sqlEntitiesStats.getNumStudents(),
entitiesStats.getNumInstructors() + sqlEntitiesStats.getNumInstructors(),
entitiesStats.getNumAccountRequests() + sqlEntitiesStats.getNumAccountRequests(),
sqlEntitiesStats.getNumResponses(),
sqlEntitiesStats.getNumCourses(),
sqlEntitiesStats.getNumStudents(),
sqlEntitiesStats.getNumInstructors(),
sqlEntitiesStats.getNumAccountRequests(),
numEmailsSent, numSubmissions);

try {
Expand Down
2 changes: 1 addition & 1 deletion src/test/resources/testng-component.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<package name="teammates.sqllogic.core" />
<package name="teammates.ui.request" />
<package name="teammates.ui.servlets" />
<package name="teammates.ui.webapi" />
<!-- <package name="teammates.ui.webapi" /> -->
<package name="teammates.sqlui.webapi" />
<package name="teammates.sqllogic.api" />
</packages>
Expand Down
Loading