[#11878] Fix reject email content #13029
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ziqing26
added a commit
that referenced
this pull request
Apr 18, 2024
* Enable CI on account request form branch * [#11878] Remove AccountRequest unique constraint (#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 <[email protected]> --------- Co-authored-by: EuniceSim142 <[email protected]> * [#11878] Add status and comments to AccountRequest (#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 * [#11878] Add new account request alert email for admins (#12926) * Add admin alert email * Add email type * Add subject * Add email content * Indicate that action is needed in the email subject * [#11878] Add GetAllPendingAccountRequests API (#12927) * 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 * [#11878] Modify CreateAccountRequestAction (#12913) * 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 * [#11878] Upgrade instructor request form UI (#12929) * 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 <[email protected]> * 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 <[email protected]> * [#11878] Update Admin Home Page UI for ARF (#12933) * 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 * [#11878] Admin Search UI Update for ARF (#12945) * 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 * [#11878] Add methods to get an account request by ID (#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 * [#11878] Add snapshot tests for instructor request form UI (#12942) * Add snapshot tests * Change double quotes to single quotes * [#11878] Foundation for getting by ID in account request endpoints (#12957) * Add account request ID query parameter * Add account request ID to related front-end types * Get account requests by ID in storage update method (#12955) * Get an account request by ID in SQL injection tests (#12956) * [#11878] Create instructor request acknowledgement email (#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 * [#11878] Merge master into account-request-form (#12972) * Update chrome driver download link in e2e-testing.md (#12924) * [#12048] Add SQL configuration into build.properties and build-dev.properties (#12917) * Add production config * Remove forgotten host and password * Fix lint --------- Co-authored-by: Zhang Ziqing <[email protected]> * [#12048] Add SQL description for postgres config (#12931) * Add production config * Remove forgotten host and password * Fix lint * Address changes, include production_user * Linting * [#12588] Improve test code coverage of core components - ToastComponent (#12916) * add test cases * add test case for isTemplate() --------- Co-authored-by: Cedric Ong <[email protected]> Co-authored-by: Dominic Lim <[email protected]> * [#12588] Add unit tests to question edit answer form (#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 <[email protected]> * add delay to task queuer for indexing account request (#12936) Co-authored-by: Nicolas <[email protected]> * Make account req data migration script rerunnable (#12932) * [#12048] Relax read notif verification for migration verification script (#12937) * Fix account requests with wrong field during seed * Relax account attributes verification * Fix lint errors * Fix order of account request variables * [#12920] Create script to migrate noSQL test data to SQL schema format (#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 * [#12588] Improve test code coverage of core components - ViewResultsPanelComponent (#12918) * add test cases to ViewResultsPanelComponent * fix lint errors --------- Co-authored-by: Dominic Lim <[email protected]> Co-authored-by: Zhang Ziqing <[email protected]> * fix resetAccountAction (#12934) Co-authored-by: Zhang Ziqing <[email protected]> * [#12048] Migrate Feedback Rank Option E2E test (#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 <[email protected]> Co-authored-by: Cedric Ong <[email protected]> * [#12048] Migrate FeedbackMcqQuestionE2ETest (#12820) * Migrate MCQ E2E * Fix lint * Fix lint * Update xml --------- Co-authored-by: Cedric Ong <[email protected]> * [#12048] Remove unnecessary loading of datastore entities in InstructorNotificationsPageE2ETest (#12911) * migrate instructor notif e2e --------- Co-authored-by: Cedric Ong <[email protected]> * [#12048] Migrate InstructorCourseDetailsPageE2ETest (#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 * [#12588] add unit tests for question submission form (#12897) Co-authored-by: Zhang Ziqing <[email protected]> * Update developers.json (#12958) * Merge pull request #12960 from TEAMMATES/master (#12961) * [#12048] Fix account request indexing (#12967) * Add isTransactionNeeded method to Action * Remove delay from taskqueuer * Change CreateAccountRequest to handle own transactions * configure agroal connection pool (#12971) * Fix comment style for merge * Remove unnecessary check for account request --------- Co-authored-by: Nada Ayesh <[email protected]> Co-authored-by: FergusMok <[email protected]> Co-authored-by: Maureen Chang <[email protected]> Co-authored-by: Cedric Ong <[email protected]> Co-authored-by: Dominic Lim <[email protected]> Co-authored-by: Nicolas <[email protected]> Co-authored-by: Ching Ming Yuan <[email protected]> Co-authored-by: Wei Qing <[email protected]> Co-authored-by: DS <[email protected]> Co-authored-by: Jay Aljelo Ting <[email protected]> * [#11878] Change institute length limit (#12974) * Change institute name max length to 128 * Edit test case for new length limit * [#11878] Update SearchAccountRequests endpoint (#12950) * 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 * [#11878] Integrate instructor request form with API (#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 * [#11878] Create Update Account Request Action (#12982) * 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 * [#11878] Fix Account Request Update Search Indexing (#12984) * update account request indexing * add methods to test access control * refactoring for transactions * [#11878] Add Edit and Approve Account Requests functionality (#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 * [#11878] Add AccountRequest Rejection email generator. (#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 * [#11878] Create reject account request endpoint (#12985) * Create account request rejection endpoint * Add validation * Add check for already rejected request when sending email * Add integration test cases * Set request method to post * Fix lint errors * Update tests list * Update validation check * Add test for validation * Fix lint errors * Fix validation comparison * Fix error message test * Add email sending * Update test cases * Refactor reason check code for clarity * Remove unused modal (#12998) * use transactions for reject account request action (#13001) * [#11878] Create Rejection Modal for Account Requests (#12989) * Create rejection modal * fix lint and tests * fix placeholders and lint * remove title * integrate api * check undefined title and body * fix trailing white spaces * fix whitespace * change error message * re-add account request table on home page * replace support email * [#11878] Update DeleteAccountRequest to reference by ID (#12997) * Update to delete by id * fix lint * fix lint * fix frontend lint * [#11878] Update ResetAccountRequest to reference by ID (#13002) * Update reset to reference by id * fix comments * [#11878] Add Error Message for Approving Existing Account (#13004) * add error message for duplicate account request * add tests * [#11878] Get account request by uuid (#13007) * change GetAccountRequestAction to get by id * fix tests * remove unncessary todo * [#11878] Handle Duplicate Approved Account Requests (#13009) * [#11878] Merge master into feature (#13011) * Update chrome driver download link in e2e-testing.md (#12924) * [#12048] Add SQL configuration into build.properties and build-dev.properties (#12917) * Add production config * Remove forgotten host and password * Fix lint --------- Co-authored-by: Zhang Ziqing <[email protected]> * [#12048] Add SQL description for postgres config (#12931) * Add production config * Remove forgotten host and password * Fix lint * Address changes, include production_user * Linting * [#12588] Improve test code coverage of core components - ToastComponent (#12916) * add test cases * add test case for isTemplate() --------- Co-authored-by: Cedric Ong <[email protected]> Co-authored-by: Dominic Lim <[email protected]> * [#12588] Add unit tests to question edit answer form (#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 <[email protected]> * add delay to task queuer for indexing account request (#12936) Co-authored-by: Nicolas <[email protected]> * Make account req data migration script rerunnable (#12932) * [#12048] Relax read notif verification for migration verification script (#12937) * Fix account requests with wrong field during seed * Relax account attributes verification * Fix lint errors * Fix order of account request variables * [#12920] Create script to migrate noSQL test data to SQL schema format (#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 * [#12588] Improve test code coverage of core components - ViewResultsPanelComponent (#12918) * add test cases to ViewResultsPanelComponent * fix lint errors --------- Co-authored-by: Dominic Lim <[email protected]> Co-authored-by: Zhang Ziqing <[email protected]> * fix resetAccountAction (#12934) Co-authored-by: Zhang Ziqing <[email protected]> * [#12048] Migrate Feedback Rank Option E2E test (#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 <[email protected]> Co-authored-by: Cedric Ong <[email protected]> * [#12048] Migrate FeedbackMcqQuestionE2ETest (#12820) * Migrate MCQ E2E * Fix lint * Fix lint * Update xml --------- Co-authored-by: Cedric Ong <[email protected]> * [#12048] Remove unnecessary loading of datastore entities in InstructorNotificationsPageE2ETest (#12911) * migrate instructor notif e2e --------- Co-authored-by: Cedric Ong <[email protected]> * [#12048] Migrate InstructorCourseDetailsPageE2ETest (#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 * [#12588] add unit tests for question submission form (#12897) Co-authored-by: Zhang Ziqing <[email protected]> * Update developers.json (#12958) * Merge pull request #12960 from TEAMMATES/master (#12961) * [#12048] Fix account request indexing (#12967) * Add isTransactionNeeded method to Action * Remove delay from taskqueuer * Change CreateAccountRequest to handle own transactions * configure agroal connection pool (#12971) * [#12048] Configure connection pool using hikari (#12978) * Configure hikari * Remove spacing * Lint * [#12048] Update liquibase configuration (#12930) * 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 <[email protected]> * [#12048] Migrate AccountRequestsLogicTest (#12780) * Migrate test cases for AccountRequestsLogic * Remove test case * Split test cases * [#12048] Migrate AdminSearchPageE2ETest SQL (#12811) * 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 <[email protected]> * [#12995] Create documentation for unit tests (#12996) * Create documentation for unit tests * Update docs/unit-testing.md Co-authored-by: Zhang Ziqing <[email protected]> * Update docs/unit-testing.md Co-authored-by: Zhang Ziqing <[email protected]> --------- Co-authored-by: Zhang Ziqing <[email protected]> * [#12048] Remove feedbackSession attributes @fetch annotation (#12992) * Remove feedbackSession @fetch annotation * [#12048] create skeleton for sql LNP tests (#12994) * create skelton for sql LNP tests * allow lnp test to access sql storage and ensure sql lnp tests are independant of each other --------- Co-authored-by: Zhang Ziqing <[email protected]> * [#12048] Migrate FeedbackNumScaleQuestionE2ETest (#12940) * Migrate num scale e2e * Fix team id * Fix bugs * Add v9.0.0 tag to liquibase changelog (#13005) * sort courses by id before comparison (#13003) Co-authored-by: Dominic Lim <[email protected]> --------- Co-authored-by: Nada Ayesh <[email protected]> Co-authored-by: FergusMok <[email protected]> Co-authored-by: Maureen Chang <[email protected]> Co-authored-by: Cedric Ong <[email protected]> Co-authored-by: Dominic Lim <[email protected]> Co-authored-by: Nicolas <[email protected]> Co-authored-by: Ching Ming Yuan <[email protected]> Co-authored-by: Wei Qing <[email protected]> Co-authored-by: DS <[email protected]> Co-authored-by: Jay Aljelo Ting <[email protected]> Co-authored-by: Xenos F <[email protected]> Co-authored-by: domoberzin <[email protected]> Co-authored-by: Marques Tye Jia Jun <[email protected]> * [#11878] Add tests for Account Request Table (#12977) * add component tests for account request table * modify tests * remove old tests * remove comment * remove unnecessary code * add tests * update disabled criteria * remove extra builders and update snaps * [#11878] Reference account requests by ID in tests (#13017) * Reference by ID in GetCourseJoinStatusActionIT * Reference by ID in AccountRequestsDbIT * Reference by ID in AccountRequestsLogicIT * Reference by ID in CreateAccountActionIT * Reference by ID in BaseTestCaseWithSqlDatabaseAccess * Remove now irrelevant reference by email address and institute * [#11878] Fix Approval Email Bug (#13027) * [#11878] Fix reject email content (#13029) * [#11878] Add Toasts (#13028) * add toasts * lint * [#11878] Remove mention of home page URL from confirmation email (#13030) * fix highlighting and null statuses (#13031) * [#11878] Fix Overlapping Tooltip (#13026) * fix tooltip * re-add removed lines * update snap * update snaps * lint * suppress warning * lint * [#11878] Check if account request is not created by admin before sending email (#13032) * Add check if admin when creating account request * Trim down test case * [#11878] Add sort by created_at for getAllPendingRequests (#13038) * feat: add order-by * fix: fix failing test case * fix: add missing created-at field * fix: test case comment * [#11878] Request Page E2E (#13015) * Add E2E skeleton * Fix test and lint * Add verifyEmailSent * fix fe tests * Remove method from logic and db (#13044) * [#11878] Migrate AccountRequestsLogic unit tests (#13043) * Add get typical account request method * Migrate AccountRequestsLogicTest * Remove test for get by email address and institute --------- Co-authored-by: Jay Aljelo Ting <[email protected]> * [#11878] Add Admin E2E Tests (#13020) * add admin e2e tests * remove exception catching and update snaps * fix snaps * add comment verification * fix test * [#11878] Add SQLI tests (#13047) * Revert "Enable CI on account request form branch" (#13049) This reverts commit 186a97a. --------- Co-authored-by: Jay Ting <[email protected]> Co-authored-by: EuniceSim142 <[email protected]> Co-authored-by: Xenos F <[email protected]> Co-authored-by: domoberzin <[email protected]> Co-authored-by: Nada Ayesh <[email protected]> Co-authored-by: FergusMok <[email protected]> Co-authored-by: Maureen Chang <[email protected]> Co-authored-by: Cedric Ong <[email protected]> Co-authored-by: Dominic Lim <[email protected]> Co-authored-by: Nicolas <[email protected]> Co-authored-by: Ching Ming Yuan <[email protected]> Co-authored-by: Wei Qing <[email protected]> Co-authored-by: DS <[email protected]> Co-authored-by: Marques Tye Jia Jun <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Part of #11878
Outline of Solution