Skip to content
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

Jump to bottom

[#12048] Migrate Course Action classes #12092

Merged
merged 63 commits into from
Mar 20, 2023
Merged

[#12048] Migrate Course Action classes #12092

merged 63 commits into from
Mar 20, 2023

Conversation

EuniceSim142
Copy link
Contributor

@EuniceSim142 EuniceSim142 commented Feb 16, 2023 •
edited
Loading

Part of #12048

Outline of Solution

  • Modified *CourseAction classes to work with dual DB.
  • Unit Tests
    • Storage Layer: Added Unit tests for Course's storage layer
    • Logic layer: Added Unit tests for methods that do not only call courseDb's methods.
    • UI layer: Minimal unit tests added for all migrated *CourseAction classes.
  • Integration Tests: not added yet.

samuelfangjw and others added 28 commits February 6, 2023 16:22
@samuelfangjw
[TEAMMATES#12048] Set up github action workflows
6e3b1a9
@samuelfangjw
[TEAMMATES#12048] v9: Skeleton implementation (TEAMMATES#12056)
bd3b623
@daongochieu2810
[TEAMMATES#12048] Add isMigrated flag to course (TEAMMATES#12063)
63d7f66
@daongochieu2810
[TEAMMATES#12048] Add is migrated flag to datastore account (TEAMMATE…
2b8f6d8 
…S#12070)
@samuelfangjw @hhdqirui
Temporarily disable liquibase migrations
c41254a
@hhdqirui
[TEAMMATES#12048] Create Notification Entity for PostgreSQL migration (…
9198839 
…TEAMMATES#12061)
@hhdqirui
[TEAMMATES#12048] Create notification DB layer for v9 migration (TEAM…
39d13af 
…MATES#12075)
@daongochieu2810
[TEAMMATES#12048] Add UsageStatistics entity and db (TEAMMATES#12076)
74edda6
@EuniceSim142
Migrate GetCourseAction.java
cd430a8
@EuniceSim142
Migrate DeleteCourseAction.java and relevant logic functions
0c50057
@EuniceSim142
Migrate BinCourseAction.java and its related logic functions
6659daf
@EuniceSim142
Update checkSpecificAccessControl functions in BinCourseAction and De…
10307d6 
…leteCourseAction classes
@EuniceSim142
Migrate RestoreCourseAction and its related logic functions
878ba1a
@EuniceSim142
Migrate UpdateCourseAction with its related logic functions
a561b92
@samuelfangjw
[TEAMMATES#12048] Add Account Entity (TEAMMATES#12087)
a45843d
@hhdqirui
[TEAMMATES#12048] Create SQL logic for CreateNotificationAction and a…
97d54b8 
…dd relevant tests for v9 migration (TEAMMATES#12077)
@domlimm
[TEAMMATES#12048] Create Student, Instructor and User Entities for Po…
780101a 
…stgreSQL Migration (TEAMMATES#12071)
@samuelfangjw
[TEAMMATES#12048] V9: Cleanup and refactor (TEAMMATES#12090)
4b1e445
@EuniceSim142
Edit GetCourseAction and refactor out the old datastore code
77b2839
@EuniceSim142
Merge branch 'v9-migration' into migrate-course
e52751a
@samuelfangjw
[TEAMMATES#12048] Remove redundant InstructorRole Enum (TEAMMATES#12091)
238a2a7
@EuniceSim142
Fix compilation error
92ab368
@EuniceSim142
Update check for database to fetch from
f89b7f2
@EuniceSim142
Add unit tests for CoursesDb
4fda07a
@daongochieu2810
[TEAMMATES#12048] Update GetUsageStatisticsAction to include SQL enti…
0be2aab 
…ties (TEAMMATES#12084)
@EuniceSim142
Add CoursesLogicTest class
ccfe8cf
@EuniceSim142
Disable failing tests
ce2da20
@EuniceSim142
Merge branch 'v9-migration' into migrate-course
4654214
@EuniceSim142 EuniceSim142 changed the title Migrate course Action [#12048] Migrate Course Action classes Feb 19, 2023
@daongochieu2810
Copy link
Contributor

@EuniceSim142 there are still some failing unit tests. You may want to disable them if they are the old unit tests

hhdqirui
hhdqirui requested changes Mar 15, 2023
View reviewed changes
Copy link
Member

@hhdqirui hhdqirui left a comment •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just two comments and everything else is just typos and can be fixed in batch with IDE hopefully? Everything else looks good to me.

src/main/java/teammates/ui/webapi/BinCourseAction.java Outdated Show resolved Hide resolved
src/test/java/teammates/sqlui/webapi/BinCourseActionTest.java Outdated Show resolved Hide resolved
src/test/java/teammates/sqlui/webapi/BinCourseActionTest.java Outdated Show resolved Hide resolved
src/test/java/teammates/sqlui/webapi/CreateCourseActionTest.java Outdated Show resolved Hide resolved
src/test/java/teammates/sqlui/webapi/CreateCourseActionTest.java Outdated Show resolved Hide resolved
src/test/java/teammates/sqlui/webapi/RestoreCourseActionTest.java Outdated Show resolved Hide resolved
src/test/java/teammates/sqlui/webapi/UpdateCourseActionTest.java Outdated Show resolved Hide resolved
src/test/java/teammates/sqlui/webapi/UpdateCourseActionTest.java Outdated Show resolved Hide resolved
src/test/java/teammates/sqlui/webapi/UpdateCourseActionTest.java Outdated Show resolved Hide resolved
src/test/java/teammates/ui/webapi/GetCourseActionTest.java Show resolved Hide resolved
daongochieu2810
daongochieu2810 approved these changes Mar 16, 2023
View reviewed changes
Copy link
Contributor

@daongochieu2810 daongochieu2810 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

apart from the 2 comments from @hhdqirui, everything looks good to me

@samuelfangjw samuelfangjw requested a review from hhdqirui March 17, 2023 21:33
@hhdqirui hhdqirui merged commit 6c7c602 into TEAMMATES:v9-migration Mar 20, 2023
samuelfangjw added a commit that referenced this pull request Mar 20, 2023
@EuniceSim142 @samuelfangjw
@daongochieu2810 @hhdqirui @domlimm
[#12048] Migrate Course Action classes (#12092)
839c642 
* [#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 <[email protected]>
Co-authored-by: dao ngoc hieu <[email protected]>
Co-authored-by: Samuel Fang <[email protected]>
Co-authored-by: wuqirui <[email protected]>
Co-authored-by: Dominic Lim <[email protected]>
samuelfangjw added a commit that referenced this pull request Apr 8, 2023
@EuniceSim142 @samuelfangjw
@daongochieu2810 @hhdqirui @domlimm
[#12048] Migrate Course Action classes (#12092)
6c6a82f 
* [#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 <[email protected]>
Co-authored-by: dao ngoc hieu <[email protected]>
Co-authored-by: Samuel Fang <[email protected]>
Co-authored-by: wuqirui <[email protected]>
Co-authored-by: Dominic Lim <[email protected]>
@wkurniawan07 wkurniawan07 added s.ToMerge The PR is approved by all reviewers including final reviewer; ready for merging c.Task Other non-user-facing works, e.g. refactoring, adding tests and removed s.Ongoing The PR is being worked on by the author(s) labels Jan 21, 2024
@wkurniawan07 wkurniawan07 added this to the V9.0.0-beta.0 milestone Jan 21, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@hhdqirui hhdqirui hhdqirui approved these changes

@daongochieu2810 daongochieu2810 daongochieu2810 approved these changes

@samuelfangjw samuelfangjw Awaiting requested review from samuelfangjw

Assignees
No one assigned
Labels
c.Task Other non-user-facing works, e.g. refactoring, adding tests s.ToMerge The PR is approved by all reviewers including final reviewer; ready for merging
Projects
None yet
Milestone
V9.0.0-beta.0
Development

Successfully merging this pull request may close these issues.
7 participants
@EuniceSim142 @fsgmhoward @samuelfangjw @daongochieu2810 @hhdqirui @wkurniawan07 @domlimm