Update GetUsageStatisticsAction to include SQL entities #12084

daongochieu2810 · 2023-02-13T06:50:24Z

Part of #12048

Outline of Solution

Update the action to include entities from sql db
Update UsageStatisticsRangeData to support mapping from the sql entities

samuelfangjw · 2023-02-13T11:30:53Z

@daongochieu2810, we need unit tests for this and the db layer. Let's not relegate testing to an afterthought, sets a bad precedent for future PRs.

samuelfangjw

Need some tests for this. Some simple integration tests (basically just the success case + any cases that cannot be tested via unit tests), defined in the it package and unit tests for each component (action, db and non-trivial logic methods).

src/main/java/teammates/ui/output/UsageStatisticsData.java

src/main/java/teammates/ui/output/UsageStatisticsRangeData.java

samuelfangjw · 2023-02-15T16:52:24Z

src/main/java/teammates/sqllogic/core/UsageStatisticsLogic.java

+        int numResponses = 0; //feedbackResponsesLogic.getNumFeedbackResponsesByTimeRange(startTime, endTime);
+        int numCourses = 0; //coursesLogic.getNumCoursesByTimeRange(startTime, endTime);
+        int numStudents = 0; //studentsLogic.getNumStudentsByTimeRange(startTime, endTime);


Note that we will need to support the old methods as well. Course related entities will not be migrated immediately, so there will be a period of time we have to fetch statistics for both new and old entities.

@samuelfangjw I will make sure to do this in CalculateUsageStatisticsAction in the next PR

src/main/java/teammates/sqllogic/api/Logic.java

src/main/java/teammates/sqllogic/core/UsageStatisticsLogic.java

hhdqirui

LGTM!

samuelfangjw

Requesting a minor change to keep things clean, LGTM otherwise!

src/main/java/teammates/sqllogic/api/Logic.java

…ties (TEAMMATES#12084)

)

* [#12048] Set up github action workflows * [#12048] v9: Skeleton implementation (#12056) * [#12048] Add isMigrated flag to course (#12063) * [#12048] Add is migrated flag to datastore account (#12070) * Temporarily disable liquibase migrations * [#12048] Create Notification Entity for PostgreSQL migration (#12061) * [#12048] Create notification DB layer for v9 migration (#12075) * [#12048] Add UsageStatistics entity and db (#12076) * Migrate GetCourseAction.java * Migrate DeleteCourseAction.java and relevant logic functions * Migrate BinCourseAction.java and its related logic functions * Update checkSpecificAccessControl functions in BinCourseAction and DeleteCourseAction classes * Migrate RestoreCourseAction and its related logic functions * Migrate UpdateCourseAction with its related logic functions * [#12048] Add Account Entity (#12087) * [#12048] Create SQL logic for CreateNotificationAction and add relevant tests for v9 migration (#12077) * [#12048] Create Student, Instructor and User Entities for PostgreSQL Migration (#12071) * [#12048] V9: Cleanup and refactor (#12090) * Edit GetCourseAction and refactor out the old datastore code * [#12048] Remove redundant InstructorRole Enum (#12091) * Fix compilation error * Update check for database to fetch from * Add unit tests for CoursesDb * [#12048] Update GetUsageStatisticsAction to include SQL entities (#12084) * Add CoursesLogicTest class * Disable failing tests * Fix compilation error * Fix Checkstyle errors * Merge branch * Change flow for updating courses. * Update updateCourse JavaDoc comment. * Update CreateCourseAction and related methods * Update GetCourseAction. * Update UpdateCourseAction * Update BinCourseAction and RestoreCourseAction * Update DeleteCourseAction * Migrate GetCourseSectionNamesAction and related methods. * Add Unit tests for Logic layer of Course. * Fix Checkstyle errors * Add unit test for GetCourseAction's execute function * Add verify for CoursesDb unit tests and use assertNull and assertNotNull * Move fetching of course to logic layer. * Fix Checkstyle errors. * Move canCreateCourse logic to logic layer. * Change *CourseAction classes to use isCourseMigrated * Fix CoursesLogic's initLogicDependencies method call * Add unit tests for GetCourseAction. * Remove commented out method. * Add minimal unit tests for BinCourseAction, DeleteCourseAction and RestoreCourseAction. * Add minimal unit tests for GetCourseSectionAction and UpdateCourseAction. * Remove unused EntityType parameter. * Add minimal unit tests for CreateCourseAction. * Fix Checkstyle errors. * Ignore all old datastore test cases for *CourseAction classes. * Fix 'text' type to 'test'. * Change binCourseToRecycleBin to return the binned course. * Update moveCourseToRecycleBin test. * Update test name. --------- Co-authored-by: Samuel Fang <samuelfangjw@gmail.com> Co-authored-by: dao ngoc hieu <53283766+daongochieu2810@users.noreply.github.com> Co-authored-by: Samuel Fang <60355570+samuelfangjw@users.noreply.github.com> Co-authored-by: wuqirui <53338059+hhdqirui@users.noreply.github.com> Co-authored-by: Dominic Lim <46486515+domlimm@users.noreply.github.com>

)

* [#12048] Set up github action workflows * [#12048] v9: Skeleton implementation (#12056) * [#12048] Add isMigrated flag to course (#12063) * [#12048] Add is migrated flag to datastore account (#12070) * Temporarily disable liquibase migrations * [#12048] Create Notification Entity for PostgreSQL migration (#12061) * [#12048] Create notification DB layer for v9 migration (#12075) * [#12048] Add UsageStatistics entity and db (#12076) * Migrate GetCourseAction.java * Migrate DeleteCourseAction.java and relevant logic functions * Migrate BinCourseAction.java and its related logic functions * Update checkSpecificAccessControl functions in BinCourseAction and DeleteCourseAction classes * Migrate RestoreCourseAction and its related logic functions * Migrate UpdateCourseAction with its related logic functions * [#12048] Add Account Entity (#12087) * [#12048] Create SQL logic for CreateNotificationAction and add relevant tests for v9 migration (#12077) * [#12048] Create Student, Instructor and User Entities for PostgreSQL Migration (#12071) * [#12048] V9: Cleanup and refactor (#12090) * Edit GetCourseAction and refactor out the old datastore code * [#12048] Remove redundant InstructorRole Enum (#12091) * Fix compilation error * Update check for database to fetch from * Add unit tests for CoursesDb * [#12048] Update GetUsageStatisticsAction to include SQL entities (#12084) * Add CoursesLogicTest class * Disable failing tests * Fix compilation error * Fix Checkstyle errors * Merge branch * Change flow for updating courses. * Update updateCourse JavaDoc comment. * Update CreateCourseAction and related methods * Update GetCourseAction. * Update UpdateCourseAction * Update BinCourseAction and RestoreCourseAction * Update DeleteCourseAction * Migrate GetCourseSectionNamesAction and related methods. * Add Unit tests for Logic layer of Course. * Fix Checkstyle errors * Add unit test for GetCourseAction's execute function * Add verify for CoursesDb unit tests and use assertNull and assertNotNull * Move fetching of course to logic layer. * Fix Checkstyle errors. * Move canCreateCourse logic to logic layer. * Change *CourseAction classes to use isCourseMigrated * Fix CoursesLogic's initLogicDependencies method call * Add unit tests for GetCourseAction. * Remove commented out method. * Add minimal unit tests for BinCourseAction, DeleteCourseAction and RestoreCourseAction. * Add minimal unit tests for GetCourseSectionAction and UpdateCourseAction. * Remove unused EntityType parameter. * Add minimal unit tests for CreateCourseAction. * Fix Checkstyle errors. * Ignore all old datastore test cases for *CourseAction classes. * Fix 'text' type to 'test'. * Change binCourseToRecycleBin to return the binned course. * Update moveCourseToRecycleBin test. * Update test name. --------- Co-authored-by: Samuel Fang <samuelfangjw@gmail.com> Co-authored-by: dao ngoc hieu <53283766+daongochieu2810@users.noreply.github.com> Co-authored-by: Samuel Fang <60355570+samuelfangjw@users.noreply.github.com> Co-authored-by: wuqirui <53338059+hhdqirui@users.noreply.github.com> Co-authored-by: Dominic Lim <46486515+domlimm@users.noreply.github.com>

Add sql UsageStatistics to GetUsageStatisticsAction

b290a5c

daongochieu2810 changed the base branch from master to v9-migration February 13, 2023 06:50

daongochieu2810 added 3 commits February 15, 2023 18:00

Fix lint

2d81e86

Add db test for UsageStatistics

daa4619

Resolve conflicts

13279fa

daongochieu2810 requested review from samuelfangjw, hhdqirui and zhaojj2209 February 15, 2023 14:12

samuelfangjw reviewed Feb 15, 2023

View reviewed changes

hhdqirui requested changes Feb 15, 2023

View reviewed changes

src/main/java/teammates/sqllogic/api/Logic.java Outdated Show resolved Hide resolved

src/main/java/teammates/sqllogic/core/UsageStatisticsLogic.java Outdated Show resolved Hide resolved

src/main/java/teammates/sqllogic/core/UsageStatisticsLogic.java Outdated Show resolved Hide resolved

daongochieu2810 added 5 commits February 18, 2023 15:27

Merge branch 'v9-migration' into add-get-statistics-action-and-tests

3579559

Resolve suggestions

8687cb8

Add integration test for usage stats db

630a36d

Register UsageStatistics

792b790

Fix tests

ed35b4a

daongochieu2810 requested review from samuelfangjw and hhdqirui February 18, 2023 15:17

hhdqirui approved these changes Feb 18, 2023

View reviewed changes

samuelfangjw approved these changes Feb 18, 2023

View reviewed changes

src/main/java/teammates/sqllogic/api/Logic.java Outdated Show resolved Hide resolved

daongochieu2810 and others added 2 commits February 19, 2023 12:06

Move assertions to specific logic

80aedba

Remove trailing whitespace

1d62d4a

samuelfangjw merged commit 0be2aab into TEAMMATES:v9-migration Feb 19, 2023

domlimm pushed a commit to domlimm/teammates that referenced this pull request Feb 22, 2023

[TEAMMATES#12048] Update GetUsageStatisticsAction to include SQL enti…

b1144f7

…ties (TEAMMATES#12084)

samuelfangjw pushed a commit that referenced this pull request Feb 26, 2023

[#12048] Update GetUsageStatisticsAction to include SQL entities (#12084

8fc98ad

)

samuelfangjw pushed a commit that referenced this pull request Apr 8, 2023

[#12048] Update GetUsageStatisticsAction to include SQL entities (#12084

831f312

)

wkurniawan07 added the s.ToMerge The PR is approved by all reviewers including final reviewer; ready for merging label Jan 21, 2024

wkurniawan07 added the c.Task Other non-user-facing works, e.g. refactoring, adding tests label Jan 21, 2024

wkurniawan07 added this to the V9.0.0-beta.0 milestone Jan 21, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Update GetUsageStatisticsAction to include SQL entities #12084

Update GetUsageStatisticsAction to include SQL entities #12084

daongochieu2810 commented Feb 13, 2023

samuelfangjw commented Feb 13, 2023

samuelfangjw left a comment

samuelfangjw Feb 15, 2023

daongochieu2810 Feb 18, 2023

hhdqirui left a comment

samuelfangjw left a comment

Update GetUsageStatisticsAction to include SQL entities #12084

Update GetUsageStatisticsAction to include SQL entities #12084

Conversation

daongochieu2810 commented Feb 13, 2023

samuelfangjw commented Feb 13, 2023

samuelfangjw left a comment

Choose a reason for hiding this comment

samuelfangjw Feb 15, 2023

Choose a reason for hiding this comment

daongochieu2810 Feb 18, 2023

Choose a reason for hiding this comment

hhdqirui left a comment

Choose a reason for hiding this comment

samuelfangjw left a comment

Choose a reason for hiding this comment