From d1543b152f5d200305181f1aaeecaf571a128b15 Mon Sep 17 00:00:00 2001
From: Phoebe Yap <115935747+PhoebeY05@users.noreply.github.com>
Date: Mon, 2 Feb 2026 17:59:52 +0800
Subject: [PATCH] Migrating CalculateUsageStatisticsAction.java
---
.github/workflows/axe.yml | 4 +---
.github/workflows/e2e-sql.yml | 2 +-
.../ui/webapi/CalculateUsageStatisticsAction.java | 12 +++++-------
src/test/resources/testng-component.xml | 2 +-
4 files changed, 8 insertions(+), 12 deletions(-)
diff --git a/.github/workflows/axe.yml b/.github/workflows/axe.yml
index 6868e95dab9..4f544107eae 100644
--- a/.github/workflows/axe.yml
+++ b/.github/workflows/axe.yml
@@ -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
diff --git a/.github/workflows/e2e-sql.yml b/.github/workflows/e2e-sql.yml
index f7bddbd362b..bcdc0096980 100644
--- a/.github/workflows/e2e-sql.yml
+++ b/.github/workflows/e2e-sql.yml
@@ -14,7 +14,7 @@ on:
schedule:
- cron: "0 0 * * *" #end of every day
workflow_dispatch:
-
+
jobs:
E2E-sql-testing:
runs-on: ubuntu-latest
diff --git a/src/main/java/teammates/ui/webapi/CalculateUsageStatisticsAction.java b/src/main/java/teammates/ui/webapi/CalculateUsageStatisticsAction.java
index b892f36e08f..febe22f3ca3 100644
--- a/src/main/java/teammates/ui/webapi/CalculateUsageStatisticsAction.java
+++ b/src/main/java/teammates/ui/webapi/CalculateUsageStatisticsAction.java
@@ -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;
@@ -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, "");
@@ -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 {
diff --git a/src/test/resources/testng-component.xml b/src/test/resources/testng-component.xml
index 800b3daf8d6..0acf015120f 100644
--- a/src/test/resources/testng-component.xml
+++ b/src/test/resources/testng-component.xml
@@ -19,7 +19,7 @@
-
+