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.

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

[#12048] Update v9 course migration feature branch #13112

Merged

Conversation

NicolasCwy
Copy link
Contributor

Part of #12048

Outline of Solution
Update feature branch post ARF and logs feature

ziqing26 and others added 30 commits March 12, 2024 09:56
TEAMMATES#12895)

* Create FeedbackSessionLog entity

* fix lint

* Create UpdateFeedbackSessionLogsAction

* Sort query results from logging service

* Update type of feedbackSessionLogType

* Fix naming

* Fix enum in entity

* Update filter to differentiate by session

* Add Uri Info

* Add tests

* Update test case

* Update to getOrderedFeedbackSessionLogs
…12899)

* Remove AccountRequest unique constraint

* Remove EntityAlreadyExistsException from the throws clause

* Remove unused import of EntityAlreadyExistsException

* Fix failing checks

* Remove EntityAlreadyExistsException in dependents

* Remove assertion that is now incorrect

* Remove mysterious trailing whitespaces that appeared out of nowhere

* Remove parts in E2E test that are no longer relevant

* Remove unused import

* Improve clarity of test case

Co-authored-by: EuniceSim142 <77243938+EuniceSim142@users.noreply.github.com>

---------

Co-authored-by: EuniceSim142 <77243938+EuniceSim142@users.noreply.github.com>
…S#12898)

* Add AccountRequestStatus

* Add AccountRequest status attribute

* Add status to AccountRequest constructor

* Add AccountRequest comments attribute

* Add comments to AccountRequest constructor

* Wrap lines

* Remove mysterious unnecessary imports that appeared out of nowhere

* Use non-null placeholder

* Use literal placeholder
…MMATES#12926)

* Add admin alert email

* Add email type

* Add subject

* Add email content

* Indicate that action is needed in the email subject
* add endpoint

* remove 'all' in class and method names

* fix checkstyle

* add it test

* fix checkstyle

* fix checkstyle

* fix failing test

* update endpoint url

* update it tests

* fix linting

* update param name

* update request param condition
* Add AccountCreateRequest instructorComments attribute

* Add new AccountRequestData attributes

* Remove check for registered instructor

* Remove sending of registration email

* Use AccountCreateRequest comments

* Change output of CreateAccountRequestAction to AccountRequestData

* Add CreateAccountRequestActionIT

* Test execute with null arguments

* Test execute with valid requests

* Test execute on invalid arguments

* Allow anybody to create an account request

* Fix architecture test

* Fix test

* Update tests to verify search indexing
* Add confirmation prompt

* Remove old form iframe

* Improve declaration view spacing

* Edit page heading phrasing for clarity

* Create request form

* Add validation messages

* Fix form validation

* Set up form submission confirmation

* Create submission acknowledgement view

* Fix URL checking regex

* Fix initial state

* Display placeholder when optional field is empty

* Fix code style

* Edit comment for clarity

* Fix institution and country combination

Co-authored-by: Jay Aljelo Ting <65202977+jayasting98@users.noreply.github.com>

* Fix naming

* Remove hard line break

* Add explanatory comment for regex

* Remove newline

* Add newlines at end of file

* Clear styles file

* Re-add styles file

* Include test

* Add test cases for requestSubmissionEvent

* Improve test case readability

* Edit test case name for clarity

* Add snapshot tests

* Revert "Add snapshot tests"

This reverts commit ec7395d.

* Fix lint errors

* Rename methods to be clearer

* Disable submit button when not ready to submit

---------

Co-authored-by: Jay Aljelo Ting <65202977+jayasting98@users.noreply.github.com>
* create component for account request table

* cherry pick admin home page changes

* remove testing code

* fix lint and css issues

* fix admin home page snaps

* update admin home snaps

* remove edit approve and reject components

* modify css

* delete edit and reject modal components

* revert spec file changes

* integrate new types

* fix lint

* use enum for status

* fix lint

* fix css lint

* fix lint

* fix lint

* use enum and remove infinite scroll

* remove approve account request code

* remove extra div

* fix url

* modify comments

* revert extra formatting

* remove plural form and use date pipe

* fix naming

* fix spec file and update institute formatting

* fix lint

* combine institute and country columns
* update admin search page to use acc req component

* fix selector for e2e test

* fix spec files and imports

* update e2e selector

* fix column numbers
…TES#12953)

* Add facade logic method to get an account request by ID

* Add storage method to get an account request by ID

* Add logic method to get an account request by ID
…EAMMATES#12914)

* Create FeedbackSessionLog entity

* fix lint

* Create UpdateFeedbackSessionLogsAction

* Sort query results from logging service

* Update type of feedbackSessionLogType

* Fix naming

* Fix enum in entity

* Update filter to differentiate by session

* Add Uri Info

* Add tests

* Update test case

* Update to getOrderedFeedbackSessionLogs

* Create skeleton

* Implement logic and db layer

* fix lint

* Update entity

* Fix tests

* Fix bugs and optimize action

* Prevent courseId from being null

* Update GCP logs to store ids

* Fix tests

* Update action to use reference

* Add some error handling

* Fix tests

* Add ids to api output
…EAMMATES#12942)

* Add snapshot tests

* Change double quotes to single quotes
…points (TEAMMATES#12957)

* Add account request ID query parameter

* Add account request ID to related front-end types
…AMMATES#12944)

* Create instructor request acknowledgement email

* Add tests for acknowledgement email

* Fix test cases

* Fix comments in expected email

* Use config support email value in email template

* Fix email recipient

* Fix test expected emails

* Remove trailing space

* Use placeholder for support email

* Sanitize acknowledgement email

* Set acknowledgement email to bcc support
…2972)

* Update chrome driver download link in e2e-testing.md (TEAMMATES#12924)

* [TEAMMATES#12048] Add SQL configuration into build.properties and build-dev.properties (TEAMMATES#12917)

* Add production config

* Remove forgotten host and password

* Fix lint

---------

Co-authored-by: Zhang Ziqing <69516975+ziqing26@users.noreply.github.com>

* [TEAMMATES#12048] Add SQL description for postgres config (TEAMMATES#12931)

* Add production config

* Remove forgotten host and password

* Fix lint

* Address changes, include production_user

* Linting

* [TEAMMATES#12588] Improve test code coverage of core components - ToastComponent (TEAMMATES#12916)

* add test cases

* add test case for isTemplate()

---------

Co-authored-by: Cedric Ong <67156011+cedricongjh@users.noreply.github.com>
Co-authored-by: Dominic Lim <46486515+domlimm@users.noreply.github.com>

* [TEAMMATES#12588] Add unit tests to question edit answer form (TEAMMATES#12935)

* add unit tests to constsum-options-question-edit-answer-form

* add unit tests to constsum-options-question-edit-answer-form

---------

Co-authored-by: Zhang Ziqing <69516975+ziqing26@users.noreply.github.com>

* add delay to task queuer for indexing account request (TEAMMATES#12936)

Co-authored-by: Nicolas <25302138+NicolasCwy@users.noreply.github.com>

* Make account req data migration script rerunnable (TEAMMATES#12932)

* [TEAMMATES#12048] Relax read notif verification for migration verification script (TEAMMATES#12937)

* Fix account requests with wrong field during seed

* Relax account attributes verification

* Fix lint errors

* Fix order of account request variables

* [TEAMMATES#12920] Create script to migrate noSQL test data to SQL schema format (TEAMMATES#12922)

* Add classes to migrate test json data

* Add toposort  script

* Add function to remove foreign key data

* Cleanup

* WIP

* Simplify keys for students and instructors

* Fix lint issues

* Output SQL JSON in same folder as JSON

* Change output file name

* Fix bug: wrong jsonkey used

* Fix lint error

* Make section and team name unique

* Set read notification key to be unique

* Delete python file

* [TEAMMATES#12588] Improve test code coverage of core components - ViewResultsPanelComponent (TEAMMATES#12918)

* add test cases to ViewResultsPanelComponent

* fix lint errors

---------

Co-authored-by: Dominic Lim <46486515+domlimm@users.noreply.github.com>
Co-authored-by: Zhang Ziqing <69516975+ziqing26@users.noreply.github.com>

* fix resetAccountAction (TEAMMATES#12934)

Co-authored-by: Zhang Ziqing <69516975+ziqing26@users.noreply.github.com>

* [TEAMMATES#12048] Migrate Feedback Rank Option E2E test (TEAMMATES#12902)

* Initial commit

* Fix lint

* Follow convention and add test

* Change file path

* Fix requested changes

* Fixed testcases

* Fix lint

* Add deepcopy

* Fixed e2e test

---------

Co-authored-by: Wei Qing <48304907+weiquu@users.noreply.github.com>
Co-authored-by: Cedric Ong <67156011+cedricongjh@users.noreply.github.com>

* [TEAMMATES#12048] Migrate FeedbackMcqQuestionE2ETest (TEAMMATES#12820)

* Migrate MCQ E2E

* Fix lint

* Fix lint

* Update xml

---------

Co-authored-by: Cedric Ong <67156011+cedricongjh@users.noreply.github.com>

* [TEAMMATES#12048] Remove unnecessary loading of datastore entities in InstructorNotificationsPageE2ETest (TEAMMATES#12911)

* migrate instructor notif e2e

---------

Co-authored-by: Cedric Ong <67156011+cedricongjh@users.noreply.github.com>

* [TEAMMATES#12048] Migrate InstructorCourseDetailsPageE2ETest (TEAMMATES#12908)

* Add teammates.e2e.cases.sql.InstructorCourseDetailsPageE2ETest

* Remove data properly to prevent clashes

* Add SQL data bundle

* Verify loaded details

* Use email address when getting a student row

* Check student links

* Verify the sending of invites

* Verify the reminding of all students to join

* Remove SQL data properly to prevent clashes

* Verify the downloading of the student list

* Implement helper methods for Student

* Add BaseTestCaseWithSqlDatabaseAccess::verifyAbsentInDatabase

* Add to testng-e2e-sql.xml

* Verify the deleting of students

* Verify the deleting of all the students

* Fix lint

* Remove duplicate equality check for students

* [TEAMMATES#12588] add unit tests for question submission form (TEAMMATES#12897)

Co-authored-by: Zhang Ziqing <69516975+ziqing26@users.noreply.github.com>

* Update developers.json (TEAMMATES#12958)

* Merge pull request TEAMMATES#12960 from TEAMMATES/master (TEAMMATES#12961)

* [TEAMMATES#12048] Fix account request indexing (TEAMMATES#12967)

* Add isTransactionNeeded method to Action

* Remove delay from taskqueuer

* Change CreateAccountRequest to handle own transactions

* configure agroal connection pool (TEAMMATES#12971)

* Fix comment style for merge

* Remove unnecessary check for account request

---------

Co-authored-by: Nada Ayesh <nayesh10@students.iugaza.edu.ps>
Co-authored-by: FergusMok <FergusMok1@gmail.com>
Co-authored-by: Maureen Chang <76696006+techMedMau@users.noreply.github.com>
Co-authored-by: Cedric Ong <67156011+cedricongjh@users.noreply.github.com>
Co-authored-by: Dominic Lim <46486515+domlimm@users.noreply.github.com>
Co-authored-by: Nicolas <25302138+NicolasCwy@users.noreply.github.com>
Co-authored-by: Ching Ming Yuan <cmingyuan123@gmail.com>
Co-authored-by: Wei Qing <48304907+weiquu@users.noreply.github.com>
Co-authored-by: DS <yeodisheng@gmail.com>
Co-authored-by: Jay Aljelo Ting <65202977+jayasting98@users.noreply.github.com>
* Change institute name max length to 128

* Edit test case for new length limit
)

* update search document and create-core script

* update it

* modify relevant classes to use id instead of (email, institute)

* remove duplicate method

* fix it tests

* fix failing tests

* remove unnecessary comment
…ES#12943)

* Integrate instructor request form FE with API

* Remove redundant statement

* Move URL regex const to backend const file

* Fix import path

* Move URL regex to FieldValidator

* Add validators to match backend fields

* Add error message box

* Change submit button display when loading

* Combine final action into subscribe

* Add max length validators for institution and country

* Fix lint errors

* Add test cases to test submission

* Add specific error messages for form validation

* Remove home page URL field

* Fix lint errors

* Remove url regex from test

* Update snap

* Clean up test code

* Remove comment about home page URL

* Change canSubmit check to getter

* Fix form submit button not re-enabling on error

* Add name pattern validator to front-end

* Fix snapshot
…EAMMATES#12938)

* Create FeedbackSessionLog entity

* fix lint

* Create UpdateFeedbackSessionLogsAction

* Sort query results from logging service

* Update type of feedbackSessionLogType

* Fix naming

* Fix enum in entity

* Update filter to differentiate by session

* Add Uri Info

* Add tests

* Update test case

* Update to getOrderedFeedbackSessionLogs

* Create skeleton

* Implement logic and db layer

* fix lint

* Update entity

* Fix tests

* Update action to use fslDb

* Fix tests

* Update DbIT to use databundle

* Fix bugs and optimize action

* Prevent courseId from being null

* Update GCP logs to store ids

* Fix tests

* Update action to use reference

* Add some error handling

* Fix tests

* Add ids to api output

* Fix lint

* Update cron.yaml

* Tidy up code

* Update comments
* create update action and IT

* update javadocs

* update tests

* add more tests

* simplify logic

* remove unused string

* fix test

* allow null comments

* add more tests

* use EntityNotFoundException

* cleanup after create account requests test

* remove unncessary check
* Update gradle config

* Update liquibase config for v9

* Turn off table generate for prod

* Update of changelog file

* Add configuration for generating changelog

* Add schema migration docs

---------

Co-authored-by: FergusMok <FergusMok1@gmail.com>
…ES#12984)

* update account request indexing

* add methods to test access control

* refactoring for transactions
…TEAMMATES#12975)

* add edit and approve functionality

* remove rejection code

* fix snap

* integrate endpoint

* disable approve button for approved requests

* use comments instead of comment

* use searchString instead of searchQuery

* fix snap
…MATES#12987)

* add rejection-email template and email generator method

* add javadoc for email generator method

* add test

* fix test method names

* fix test method name 2

* fix lint

* add bcc for rejection email
* Migrate test cases for AccountRequestsLogic

* Remove test case

* Split test cases
* test e2e changes

* fix: reduce e2e test json file size

* fix student key

* fix course key

* fix instructor keys

* fix filepath

* fix e2e test

* remove extra data from bundle

* Add correct removal logic to avoid constraint violation

* Fix e2e tests and lint

fix reset google id test

fix e2e tests

fix e2e tests

fix tests

remove double click

fix unknown symbol

add toast check

change toast verification message

remove toast check

* fix: add null check

* move admin search page e2e test to sql cases

* Rename AdminSearchPageE2ETest_SQLEntities.json to AdminSearchPageE2ETest_SqlEntities.json

* fix failing test

* fix: remove extra null check

* fix: add test to e2e sql xml file

* fix function call

* remove unnecessary changes

* create new file for sql entities

* revert unnecessary changes

* remove trailing whitespace

* add teardown for account requests

---------

Co-authored-by: Cedric Ong <67156011+cedricongjh@users.noreply.github.com>
* Create documentation for unit tests

* Update docs/unit-testing.md

Co-authored-by: Zhang Ziqing <69516975+ziqing26@users.noreply.github.com>

* Update docs/unit-testing.md

Co-authored-by: Zhang Ziqing <69516975+ziqing26@users.noreply.github.com>

---------

Co-authored-by: Zhang Ziqing <69516975+ziqing26@users.noreply.github.com>
xenosf and others added 28 commits April 18, 2024 00:53
* Fix notViewedSince

* Update disclaimer

* Change disclaimer message

* Fix view result message

* Fix not viewed since message
Added a propagation stop to the moderate response button

Co-authored-by: Wei Qing <48304907+weiquu@users.noreply.github.com>
* Add committers

* Remove contributors
…TES#13013)

* migrate InstructorStudentRecordsPageE2ETest

* Add InstructorStudentRecordsPageE2ETest to sql xml

---------

Co-authored-by: Wei Qing <48304907+weiquu@users.noreply.github.com>
…EAMMATES#12885)

* Update gradle version

* Update libraries

* Update code

* Update actions versions

* Add workflow for JDK 21
Co-authored-by: Zhang Ziqing <69516975+ziqing26@users.noreply.github.com>
…#13014)

* Migrate InstructorStudentListPageE2ETest

* Add InstructorStudentListPageE2ETest to sql xml

---------

Co-authored-by: Wei Qing <48304907+weiquu@users.noreply.github.com>
)

* return FeedbackSession directly from moveFeedbackSessionToRecycleBin

* Add verify accessible for RestoreFeedbackSessionAction and pass correct params to fsDb.getSoftDeletedFeedbackSession

* add feedbacksession to getEntity

* add getfeedbacksession methods

* migrate instructorhome page e2e test

* fix checkstyle issues

* fix pmd issues

* sort course by name instead of creation time

---------

Co-authored-by: Wei Qing <48304907+weiquu@users.noreply.github.com>
Co-authored-by: Wei Qing <48304907+weiquu@users.noreply.github.com>
Co-authored-by: FergusMok <FergusMok1@gmail.com>
…EAMMATES#13061)

* Add beta 5 changelog

* Update changelog to be in alphabetical order

* Update developers.json
…#13062)

* Update docs

* Rename changelog file

* Amend changelog naming
…13012)

* Migrate StudentCourseDetailsPageE2ETest

* Add StudentCourseDetailsPageE2ETest to sql xml

---------

Co-authored-by: Wei Qing <48304907+weiquu@users.noreply.github.com>
* add script

* order commit

* update logic

* convert to batch

* remove print
* Add captcha to ARF

* Update front-end tests

* Fix lint errors

* Change captcha to uppercase in error text

* Return captcha response when the getter is called

---------

Co-authored-by: Jay Aljelo Ting <65202977+jayasting98@users.noreply.github.com>
…MATES#13068)

* Update editAccountRequest parameter type to AccountRequestUpdateRequest

* Fixing the lint

* Refatoring editAccountRequest method

---------

Co-authored-by: Cedric Ong <67156011+cedricongjh@users.noreply.github.com>
* Add e2e test

* Migrate all tests

* Update xml

---------

Co-authored-by: YX Z <yxz@YXs-MacBook-Air-2.local>
Co-authored-by: Wei Qing <48304907+weiquu@users.noreply.github.com>
…ES#13033)

* Skeleton till shouldAllowIfBeforeDeadline

* Save progress

* Save progress

* Fix all tests

* Fix linting

* Remove redundant

* Refactor to fit integration tests structure

* Add breaking changes

* Add flush

* Fix linting

* Fix clean-up from access control
@NicolasCwy NicolasCwy merged commit 6de4d94 into TEAMMATES:v9-course-migration May 6, 2024
1 check passed
@NicolasCwy NicolasCwy deleted the v9-course-migration branch May 6, 2024 10:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet