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

Vouchers for user promotion - Part 2: Redemption #671

Merged
merged 205 commits into from
Nov 10, 2024
Merged

Vouchers for user promotion - Part 2: Redemption #671

merged 205 commits into from
Nov 10, 2024

Commits on Jul 28, 2024

  1. Initialize voucher model and add some unit tests

    @fosterfarrell9
    fosterfarrell9 committed Jul 28, 2024
    Configuration menu
    Copy the full SHA
    3980559 View commit details
    Browse the repository at this point in the history

  2. Make ensure_no_other_active_voucher validation into a callback

    @fosterfarrell9
    fosterfarrell9 committed Jul 28, 2024
    Configuration menu
    Copy the full SHA
    f9876e4 View commit details
    Browse the repository at this point in the history

Commits on Aug 4, 2024

  1. Add throw :abort in order to halt execution

    @fosterfarrell9
    fosterfarrell9 committed Aug 4, 2024
    Configuration menu
    Copy the full SHA
    1e057fc View commit details
    Browse the repository at this point in the history

  2. Replace Time.now by Time.zone.now

    @fosterfarrell9
    fosterfarrell9 committed Aug 4, 2024
    Configuration menu
    Copy the full SHA
    681fe94 View commit details
    Browse the repository at this point in the history

  3. Set up basic functionality for display of vouchers for tutors

    @fosterfarrell9
    fosterfarrell9 committed Aug 4, 2024
    Configuration menu
    Copy the full SHA
    f514ffb View commit details
    Browse the repository at this point in the history

  4. Create separate file for copy and paste button code and decaffeinate

    @fosterfarrell9
    fosterfarrell9 committed Aug 4, 2024
    Configuration menu
    Copy the full SHA
    eb1d17d View commit details
    Browse the repository at this point in the history

  5. Set up destruction of tutor vouchers

    @fosterfarrell9
    fosterfarrell9 committed Aug 4, 2024
    Configuration menu
    Copy the full SHA
    b594cc3 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'dev' into feature/vouchers-user-promotion

    @fosterfarrell9
    fosterfarrell9 committed Aug 4, 2024
    Configuration menu
    Copy the full SHA
    8f980b0 View commit details
    Browse the repository at this point in the history

  7. Rename view file as it containes embedded ruby

    @fosterfarrell9
    fosterfarrell9 committed Aug 4, 2024
    Configuration menu
    Copy the full SHA
    3b5425c View commit details
    Browse the repository at this point in the history

Commits on Aug 5, 2024

  1. Add create action for vouchers and corresponding views

    @fosterfarrell9
    fosterfarrell9 committed Aug 5, 2024
    Configuration menu
    Copy the full SHA
    aad2134 View commit details
    Browse the repository at this point in the history

Commits on Aug 6, 2024

  1. Adapt views and controller for adding and removing of vouchers of dif… 

    …ferent type
    @fosterfarrell9
    fosterfarrell9 committed Aug 6, 2024
    Configuration menu
    Copy the full SHA
    e377f03 View commit details
    Browse the repository at this point in the history

  2. Put duplicate lines into a separate method

    @fosterfarrell9
    fosterfarrell9 committed Aug 6, 2024
    Configuration menu
    Copy the full SHA
    9f4edc9 View commit details
    Browse the repository at this point in the history

  3. Set up redeeming of vouchers

    @fosterfarrell9
    fosterfarrell9 committed Aug 6, 2024
    Configuration menu
    Copy the full SHA
    74637b3 View commit details
    Browse the repository at this point in the history

Commits on Aug 8, 2024

  1. fix typo

    @fosterfarrell9
    fosterfarrell9 committed Aug 8, 2024
    Configuration menu
    Copy the full SHA
    db61b04 View commit details
    Browse the repository at this point in the history

  2. remove obsolete methods

    @fosterfarrell9
    fosterfarrell9 committed Aug 8, 2024
    Configuration menu
    Copy the full SHA
    71ea44b View commit details
    Browse the repository at this point in the history

  3. Avoid use of Time.now

    @fosterfarrell9
    fosterfarrell9 committed Aug 8, 2024
    Configuration menu
    Copy the full SHA
    d54a2ab View commit details
    Browse the repository at this point in the history

Commits on Aug 9, 2024

  1. Refactor active_vouhcer_of_sort method

    @fosterfarrell9
    fosterfarrell9 committed Aug 9, 2024
    Configuration menu
    Copy the full SHA
    2a91c7c View commit details
    Browse the repository at this point in the history

  2. remove unused expired? method

    @fosterfarrell9
    fosterfarrell9 committed Aug 9, 2024
    Configuration menu
    Copy the full SHA
    f63e204 View commit details
    Browse the repository at this point in the history

  3. Remove duplicate code

    @fosterfarrell9
    fosterfarrell9 committed Aug 9, 2024
    Configuration menu
    Copy the full SHA
    3a30f97 View commit details
    Browse the repository at this point in the history

  4. remove unused variable

    @fosterfarrell9
    fosterfarrell9 committed Aug 9, 2024
    Configuration menu
    Copy the full SHA
    5751c7b View commit details
    Browse the repository at this point in the history

  5. Add controller spec for vouchers

    @fosterfarrell9
    fosterfarrell9 committed Aug 9, 2024
    Configuration menu
    Copy the full SHA
    4149f5e View commit details
    Browse the repository at this point in the history

Commits on Aug 11, 2024

  1. Rewrite controller spec for vouchers

    @fosterfarrell9
    fosterfarrell9 committed Aug 11, 2024
    Configuration menu
    Copy the full SHA
    cab3981 View commit details
    Browse the repository at this point in the history

  2. remove obsolete comment

    @fosterfarrell9
    fosterfarrell9 committed Aug 11, 2024
    Configuration menu
    Copy the full SHA
    5efa753 View commit details
    Browse the repository at this point in the history

Commits on Aug 13, 2024

  1. Set up redemption of tutor vouchers

    @fosterfarrell9
    fosterfarrell9 committed Aug 13, 2024
    Configuration menu
    Copy the full SHA
    4ca6fea View commit details
    Browse the repository at this point in the history

  2. Remove user lookup for tutor positions

    @fosterfarrell9
    fosterfarrell9 committed Aug 13, 2024
    Configuration menu
    Copy the full SHA
    555843b View commit details
    Browse the repository at this point in the history

  3. Set up redemption of editor vouchers

    @fosterfarrell9
    fosterfarrell9 committed Aug 13, 2024
    Configuration menu
    Copy the full SHA
    7b7b157 View commit details
    Browse the repository at this point in the history

Commits on Aug 14, 2024

  1. Merge branch 'dev' into feature/vouchers-user-promotion

    @fosterfarrell9
    fosterfarrell9 committed Aug 14, 2024
    Configuration menu
    Copy the full SHA
    b533d81 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'feature/vouchers-user-promotion' into feature/voucher-r… 

    …edemption
    @fosterfarrell9
    fosterfarrell9 committed Aug 14, 2024
    Configuration menu
    Copy the full SHA
    84c742c View commit details
    Browse the repository at this point in the history

Commits on Aug 15, 2024

  1. Add Contract Model and setup selection of tutors and editors

    @fosterfarrell9
    fosterfarrell9 committed Aug 15, 2024
    Configuration menu
    Copy the full SHA
    0da405e View commit details
    Browse the repository at this point in the history

  2. Set up notifications for redemption of tutor vouchers

    @fosterfarrell9
    fosterfarrell9 committed Aug 15, 2024
    Configuration menu
    Copy the full SHA
    6c8d657 View commit details
    Browse the repository at this point in the history

Commits on Aug 16, 2024

  1. Invalidate vouchers instead of destroying them

    @fosterfarrell9
    fosterfarrell9 committed Aug 16, 2024
    Configuration menu
    Copy the full SHA
    93d54f9 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'feature/vouchers-user-promotion' into feature/voucher-r… 

    …edemption
    @fosterfarrell9
    fosterfarrell9 committed Aug 16, 2024
    Configuration menu
    Copy the full SHA
    98a957a View commit details
    Browse the repository at this point in the history

  3. Add redemption and claim models and rewrite workflow accordingly

    @fosterfarrell9
    fosterfarrell9 committed Aug 16, 2024
    Configuration menu
    Copy the full SHA
    b712851 View commit details
    Browse the repository at this point in the history

  4. Restore to previous state

    @fosterfarrell9
    fosterfarrell9 committed Aug 16, 2024
    Configuration menu
    Copy the full SHA
    08ffc49 View commit details
    Browse the repository at this point in the history

  5. Fix typo

    @fosterfarrell9
    fosterfarrell9 committed Aug 16, 2024
    Configuration menu
    Copy the full SHA
    b1a6614 View commit details
    Browse the repository at this point in the history

  6. Implement Rubocop suggestion

    @fosterfarrell9
    fosterfarrell9 committed Aug 16, 2024
    Configuration menu
    Copy the full SHA
    ab82c87 View commit details
    Browse the repository at this point in the history

Commits on Aug 17, 2024

  1. Replace voucher_hash by secure_hash

    @fosterfarrell9
    fosterfarrell9 committed Aug 17, 2024
    Configuration menu
    Copy the full SHA
    f7e9b57 View commit details
    Browse the repository at this point in the history

  2. Replace redeem_voucher_params by check_voucher_params

    @fosterfarrell9
    fosterfarrell9 committed Aug 17, 2024
    Configuration menu
    Copy the full SHA
    19148e3 View commit details
    Browse the repository at this point in the history

  3. Add cancel action to vouchers controller

    @fosterfarrell9
    fosterfarrell9 committed Aug 17, 2024
    Configuration menu
    Copy the full SHA
    d2bdba7 View commit details
    Browse the repository at this point in the history

  4. Differentiate between different cases of tutor voucher redemption

    @fosterfarrell9
    fosterfarrell9 committed Aug 17, 2024
    Configuration menu
    Copy the full SHA
    2538684 View commit details
    Browse the repository at this point in the history

  5. Differentiate between different cases of editor voucher redemption

    @fosterfarrell9
    fosterfarrell9 committed Aug 17, 2024
    Configuration menu
    Copy the full SHA
    0e728d4 View commit details
    Browse the repository at this point in the history

  6. Take first steps in setting up redemption of teacher vouchers

    @fosterfarrell9
    fosterfarrell9 committed Aug 17, 2024
    Configuration menu
    Copy the full SHA
    102bcc2 View commit details
    Browse the repository at this point in the history

  7. Add notifications for redemption of teacher vouchers

    @fosterfarrell9
    fosterfarrell9 committed Aug 17, 2024
    Configuration menu
    Copy the full SHA
    09f47c2 View commit details
    Browse the repository at this point in the history

  8. Add notification mails for teacher change by voucher redemption

    @fosterfarrell9
    fosterfarrell9 committed Aug 17, 2024
    Configuration menu
    Copy the full SHA
    2205752 View commit details
    Browse the repository at this point in the history

  9. Invalidate teacher vouchers after first use

    @fosterfarrell9
    fosterfarrell9 committed Aug 17, 2024
    Configuration menu
    Copy the full SHA
    3b69eb1 View commit details
    Browse the repository at this point in the history

Commits on Aug 18, 2024

  1. Add vouchers for seminar speakers

    @fosterfarrell9
    fosterfarrell9 committed Aug 18, 2024
    Configuration menu
    Copy the full SHA
    c00f482 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'feature/vouchers-user-promotion' into feature/voucher-r… 

    …edemption
    @fosterfarrell9
    fosterfarrell9 committed Aug 18, 2024
    Configuration menu
    Copy the full SHA
    bdbaec5 View commit details
    Browse the repository at this point in the history

  3. Add helpdesk for speaker vouchers

    @fosterfarrell9
    fosterfarrell9 committed Aug 18, 2024
    Configuration menu
    Copy the full SHA
    8f6c235 View commit details
    Browse the repository at this point in the history

  4. Set up redemption of speaker vouchers

    @fosterfarrell9
    fosterfarrell9 committed Aug 18, 2024
    Configuration menu
    Copy the full SHA
    34e0063 View commit details
    Browse the repository at this point in the history

  5. Add notifications for redemption of speaker vouchers

    @fosterfarrell9
    fosterfarrell9 committed Aug 18, 2024
    Configuration menu
    Copy the full SHA
    6b662ea View commit details
    Browse the repository at this point in the history

  6. Restrict access user select

    @fosterfarrell9
    fosterfarrell9 committed Aug 18, 2024
    Configuration menu
    Copy the full SHA
    9d441ff View commit details
    Browse the repository at this point in the history

  7. Remove unused parameter

    @fosterfarrell9
    fosterfarrell9 committed Aug 18, 2024
    Configuration menu
    Copy the full SHA
    587b72f View commit details
    Browse the repository at this point in the history

Commits on Aug 19, 2024

  1. Introduce VoucherProcessor service object

    @fosterfarrell9
    fosterfarrell9 committed Aug 19, 2024
    Configuration menu
    Copy the full SHA
    a3e99ed View commit details
    Browse the repository at this point in the history

  2. Use common partial for redemption of tutor and speeaker vouchers

    @fosterfarrell9
    fosterfarrell9 committed Aug 19, 2024
    Configuration menu
    Copy the full SHA
    b71af1a View commit details
    Browse the repository at this point in the history

  3. Rename sort attribute of vouchers to role

    @fosterfarrell9
    fosterfarrell9 committed Aug 19, 2024
    Configuration menu
    Copy the full SHA
    a704e57 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'feature/vouchers-user-promotion' into feature/voucher-r… 

    …edemption
    @fosterfarrell9
    fosterfarrell9 committed Aug 19, 2024
    Configuration menu
    Copy the full SHA
    73aa5e6 View commit details
    Browse the repository at this point in the history

  5. Rename remaining occurences of sort attribute of voucher to role

    @fosterfarrell9
    fosterfarrell9 committed Aug 19, 2024
    Configuration menu
    Copy the full SHA
    0c705e2 View commit details
    Browse the repository at this point in the history

  6. Add unit tests for VoucherProcessor

    @fosterfarrell9
    fosterfarrell9 committed Aug 19, 2024
    Configuration menu
    Copy the full SHA
    4ed95d5 View commit details
    Browse the repository at this point in the history

  7. Add .uniq to method

    @fosterfarrell9
    fosterfarrell9 committed Aug 19, 2024
    Configuration menu
    Copy the full SHA
    06d06ac View commit details
    Browse the repository at this point in the history

Commits on Aug 20, 2024

  1. Remove teacher selection for non-admins

    @fosterfarrell9
    fosterfarrell9 committed Aug 20, 2024
    Configuration menu
    Copy the full SHA
    d57e66f View commit details
    Browse the repository at this point in the history

  2. Remove obsolete reference to non-existent model

    @fosterfarrell9
    fosterfarrell9 committed Aug 20, 2024
    Configuration menu
    Copy the full SHA
    692dd16 View commit details
    Browse the repository at this point in the history

  3. Remove permissions from non-admins to change teachers

    @fosterfarrell9
    fosterfarrell9 committed Aug 20, 2024
    Configuration menu
    Copy the full SHA
    e5f471e View commit details
    Browse the repository at this point in the history

  4. Add cypress data attributes

    @fosterfarrell9
    fosterfarrell9 committed Aug 20, 2024
    Configuration menu
    Copy the full SHA
    11fb080 View commit details
    Browse the repository at this point in the history

  5. Add first cypress tests

    @fosterfarrell9
    fosterfarrell9 committed Aug 20, 2024
    Configuration menu
    Copy the full SHA
    215b46b View commit details
    Browse the repository at this point in the history

Commits on Aug 21, 2024

  1. Add more cypress tests

    @fosterfarrell9
    fosterfarrell9 committed Aug 21, 2024
    Configuration menu
    Copy the full SHA
    e33db99 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'feature/vouchers-user-promotion' into feature/voucher-r… 

    …edemption
    @fosterfarrell9
    fosterfarrell9 committed Aug 21, 2024
    Configuration menu
    Copy the full SHA
    2eda386 View commit details
    Browse the repository at this point in the history

  3. Add first cypress tests for voucher redemption

    @fosterfarrell9
    fosterfarrell9 committed Aug 21, 2024
    Configuration menu
    Copy the full SHA
    8a0e965 View commit details
    Browse the repository at this point in the history

  4. Init future possibility to check clipboard content

    @Splines
    Splines committed Aug 21, 2024
    Configuration menu
    Copy the full SHA
    7429387 View commit details
    Browse the repository at this point in the history

Commits on Aug 22, 2024

  1. Merge branch 'dev' into feature/vouchers-user-promotion

    @fosterfarrell9
    fosterfarrell9 committed Aug 22, 2024
    Configuration menu
    Copy the full SHA
    8e9d0f9 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'feature/vouchers-user-promotion' into feature/voucher-r… 

    …edemption
    @fosterfarrell9
    fosterfarrell9 committed Aug 22, 2024
    Configuration menu
    Copy the full SHA
    b13f875 View commit details
    Browse the repository at this point in the history

  3. Add missing teacher field for non-admins

    @fosterfarrell9
    fosterfarrell9 committed Aug 22, 2024
    Configuration menu
    Copy the full SHA
    3710ee1 View commit details
    Browse the repository at this point in the history

  4. Add cypress tests for redemption form

    @fosterfarrell9
    fosterfarrell9 committed Aug 22, 2024
    Configuration menu
    Copy the full SHA
    049edec View commit details
    Browse the repository at this point in the history

  5. Add cypress command .tomselect to select in TomSelect forms

    @fosterfarrell9
    fosterfarrell9 committed Aug 22, 2024
    Configuration menu
    Copy the full SHA
    329194f View commit details
    Browse the repository at this point in the history

  6. Add test for redemption form using the new .tomselect command

    @fosterfarrell9
    fosterfarrell9 committed Aug 22, 2024
    Configuration menu
    Copy the full SHA
    913f816 View commit details
    Browse the repository at this point in the history

Commits on Aug 24, 2024

  1. Remove unnecessary call of trait

    @fosterfarrell9
    fosterfarrell9 committed Aug 24, 2024
    Configuration menu
    Copy the full SHA
    7289053 View commit details
    Browse the repository at this point in the history

  2. Use NO_SEMINAR_ROLES constant

    @fosterfarrell9
    fosterfarrell9 committed Aug 24, 2024
    Configuration menu
    Copy the full SHA
    5a65708 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'feature/vouchers-user-promotion' into feature/voucher-r… 

    …edemption
    @fosterfarrell9
    fosterfarrell9 committed Aug 24, 2024
    Configuration menu
    Copy the full SHA
    d719333 View commit details
    Browse the repository at this point in the history

  4. Clean up some experiments

    @fosterfarrell9
    fosterfarrell9 committed Aug 24, 2024
    Configuration menu
    Copy the full SHA
    7f68ee9 View commit details
    Browse the repository at this point in the history

  5. Remove .tomselect Command for cypress

    @fosterfarrell9
    fosterfarrell9 committed Aug 24, 2024
    Configuration menu
    Copy the full SHA
    74cae07 View commit details
    Browse the repository at this point in the history

  6. Enlarge test user json by some data

    @fosterfarrell9
    fosterfarrell9 committed Aug 24, 2024
    Configuration menu
    Copy the full SHA
    9e5d4e4 View commit details
    Browse the repository at this point in the history

  7. Add logout command and expect correct statuses for login and logout r… 

    …equests
    @fosterfarrell9
    fosterfarrell9 committed Aug 24, 2024
    Configuration menu
    Copy the full SHA
    cec8dc6 View commit details
    Browse the repository at this point in the history

  8. Add more cypress tests for redemption of tutor vouchers

    @fosterfarrell9
    fosterfarrell9 committed Aug 24, 2024
    Configuration menu
    Copy the full SHA
    b3ae179 View commit details
    Browse the repository at this point in the history

  9. Parse hashes with integer keys into arrays of strings

    @fosterfarrell9
    fosterfarrell9 committed Aug 24, 2024
    Configuration menu
    Copy the full SHA
    1f5a9f6 View commit details
    Browse the repository at this point in the history

  10. Add tests for tutor voucher redemption in the case that all tutorials… 

    … are already taken
    @fosterfarrell9
    fosterfarrell9 committed Aug 24, 2024
    Configuration menu
    Copy the full SHA
    e57e35f View commit details
    Browse the repository at this point in the history

Commits on Aug 25, 2024

  1. Add possibility to pass instance methods and refactor

    @fosterfarrell9
    fosterfarrell9 committed Aug 25, 2024
    Configuration menu
    Copy the full SHA
    9ccf03f View commit details
    Browse the repository at this point in the history

  2. Update documentation

    @fosterfarrell9
    fosterfarrell9 committed Aug 25, 2024
    Configuration menu
    Copy the full SHA
    f6a2d1f View commit details
    Browse the repository at this point in the history

  3. Add tests for voucher redemption that check notifications

    @fosterfarrell9
    fosterfarrell9 committed Aug 25, 2024
    Configuration menu
    Copy the full SHA
    c5c125c View commit details
    Browse the repository at this point in the history

  4. Add missing speaker voucher case

    @fosterfarrell9
    fosterfarrell9 committed Aug 25, 2024
    Configuration menu
    Copy the full SHA
    a173655 View commit details
    Browse the repository at this point in the history

  5. Add missing locales

    @fosterfarrell9
    fosterfarrell9 committed Aug 25, 2024
    Configuration menu
    Copy the full SHA
    05f9959 View commit details
    Browse the repository at this point in the history

  6. Add cypress tests fo editor vouchers, teacher vouchers and speaker vo… 

    …uchers
    @fosterfarrell9
    fosterfarrell9 committed Aug 25, 2024
    Configuration menu
    Copy the full SHA
    13e0386 View commit details
    Browse the repository at this point in the history

Commits on Aug 26, 2024

  1. Remove out of scope test

    @fosterfarrell9
    fosterfarrell9 committed Aug 26, 2024
    Configuration menu
    Copy the full SHA
    6422123 View commit details
    Browse the repository at this point in the history

  2. Refactor helper methods

    @fosterfarrell9
    fosterfarrell9 committed Aug 26, 2024
    Configuration menu
    Copy the full SHA
    352ade6 View commit details
    Browse the repository at this point in the history

  3. Extract helper functions to separate file

    @fosterfarrell9
    fosterfarrell9 committed Aug 26, 2024
    Configuration menu
    Copy the full SHA
    4ebc186 View commit details
    Browse the repository at this point in the history

  4. Refactor tests

    @fosterfarrell9
    fosterfarrell9 committed Aug 26, 2024
    Configuration menu
    Copy the full SHA
    fdb4efe View commit details
    Browse the repository at this point in the history

  5. Extract more methods into helper

    @fosterfarrell9
    fosterfarrell9 committed Aug 26, 2024
    Configuration menu
    Copy the full SHA
    3f68b1f View commit details
    Browse the repository at this point in the history

  6. Rename files according to conventions

    @fosterfarrell9
    fosterfarrell9 committed Aug 26, 2024
    Configuration menu
    Copy the full SHA
    c2c8b9d View commit details
    Browse the repository at this point in the history

  7. Add controller specs for changed lecture update policy

    @fosterfarrell9
    fosterfarrell9 committed Aug 26, 2024
    Configuration menu
    Copy the full SHA
    7acfa68 View commit details
    Browse the repository at this point in the history

Commits on Aug 27, 2024

  1. Refactor tests by extracting methods

    @fosterfarrell9
    fosterfarrell9 committed Aug 27, 2024
    Configuration menu
    Copy the full SHA
    2ce127f View commit details
    Browse the repository at this point in the history

Commits on Sep 21, 2024

  1. Merge branch 'dev' into feature/voucher-redemption 

    A lot of manual resolution was performed, which might have introduced
small errors.
    @Splines
    Splines committed Sep 21, 2024
    Configuration menu
    Copy the full SHA
    4576b15 View commit details
    Browse the repository at this point in the history

  2. Don't define redeem method twice 

    Apparently I missed that one during the merge.
    @Splines
    Splines committed Sep 21, 2024
    Configuration menu
    Copy the full SHA
    ee16ca2 View commit details
    Browse the repository at this point in the history

  3. Pluralize voucher redemption spec filename

    @Splines
    Splines committed Sep 21, 2024
    Configuration menu
    Copy the full SHA
    d01ec97 View commit details
    Browse the repository at this point in the history

  4. Delete duplicate migration & update new migration dates/schema

    @Splines
    Splines committed Sep 21, 2024
    Configuration menu
    Copy the full SHA
    b741b1f View commit details
    Browse the repository at this point in the history

  5. Move cypress helpers to e2e folder 

    `support` folder should be used for general test-stuff, i.e. not-related
to individual, specific tests.
    @Splines
    Splines committed Sep 21, 2024
    Configuration menu
    Copy the full SHA
    d8e5d36 View commit details
    Browse the repository at this point in the history

Commits on Sep 22, 2024

  1. Merge remote-tracking branch 'origin/dev' into feature/voucher-redemp… 

    …tion
    @Splines
    Splines committed Sep 22, 2024
    Configuration menu
    Copy the full SHA
    3eb25e9 View commit details
    Browse the repository at this point in the history

  2. Improve naming for voucher finding method 

    also moved one private function around
    @Splines
    Splines committed Sep 22, 2024
    Configuration menu
    Copy the full SHA
    4a18ac7 View commit details
    Browse the repository at this point in the history

  3. Inline JSON object in user creator controller

    @Splines
    Splines committed Sep 22, 2024
    Configuration menu
    Copy the full SHA
    b16f599 View commit details
    Browse the repository at this point in the history

  4. Use symbolic keys upon voucher type case statement

    @Splines
    Splines committed Sep 22, 2024
    Configuration menu
    Copy the full SHA
    abe2ad9 View commit details
    Browse the repository at this point in the history

  5. Fix "Redeem voucher" spelling mistake

    @Splines
    Splines committed Sep 22, 2024
    Configuration menu
    Copy the full SHA
    9ab1030 View commit details
    Browse the repository at this point in the history

Commits on Sep 23, 2024

  1. Use fixed width for voucher redemption selectize field

    @Splines
    Splines committed Sep 23, 2024
    Configuration menu
    Copy the full SHA
    8ecb489 View commit details
    Browse the repository at this point in the history

  2. Rename view file to voucher_redemption_form

    @Splines
    Splines committed Sep 23, 2024
    Configuration menu
    Copy the full SHA
    c372a2e View commit details
    Browse the repository at this point in the history

  3. Fix indentation in view file (tutor voucher)

    @Splines
    Splines committed Sep 23, 2024
    Configuration menu
    Copy the full SHA
    49b7077 View commit details
    Browse the repository at this point in the history

  4. Replace cypress describe by context

    @Splines
    Splines committed Sep 23, 2024
    Configuration menu
    Copy the full SHA
    68a3c63 View commit details
    Browse the repository at this point in the history

  5. Remove reviewer-TODO comments (selectize tomselect)

    @Splines
    Splines committed Sep 23, 2024
    Configuration menu
    Copy the full SHA
    c1199be View commit details
    Browse the repository at this point in the history

Commits on Sep 25, 2024

  1. Reset Cypress-related code to 49cf16a 

    Command used:
git checkout 49cf16a -- ./.vscode/settings.json ./app/controllers/cypress/factories_controller.rb ./app/controllers/cypress/user_creator_controller.rb ./spec/cypress/support/factorybot.js
    @Splines
    Splines committed Sep 25, 2024
    Configuration menu
    Copy the full SHA
    09502a7 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'dev' into feature/voucher-redemption

    @Splines
    Splines committed Sep 25, 2024
    Configuration menu
    Copy the full SHA
    f109d45 View commit details
    Browse the repository at this point in the history

  3. Use new .call syntax in cypress tests 

    (in order to call instance methods, see #696
    @Splines
    Splines committed Sep 25, 2024
    Configuration menu
    Copy the full SHA
    035c6bd View commit details
    Browse the repository at this point in the history

  4. Explicitly set name_in_tutorials for users

    @Splines
    Splines committed Sep 25, 2024
    Configuration menu
    Copy the full SHA
    0b88647 View commit details
    Browse the repository at this point in the history

  5. Remove constraint that user id must be a number 

    This is such that UUIDs also work.
    @Splines
    Splines committed Sep 25, 2024
    Configuration menu
    Copy the full SHA
    15fe4f1 View commit details
    Browse the repository at this point in the history

Commits on Oct 3, 2024

  1. Init support for entity-relationship-diagram creation

    @Splines
    Splines committed Oct 3, 2024
    Configuration menu
    Copy the full SHA
    8cb3c43 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'feature/erd' into feature/voucher-redemption

    @Splines
    Splines committed Oct 3, 2024
    Configuration menu
    Copy the full SHA
    c8e50d1 View commit details
    Browse the repository at this point in the history

Commits on Oct 8, 2024

  1. Add has_many :notifications for better ERD visibility

    @Splines
    Splines committed Oct 8, 2024
    Configuration menu
    Copy the full SHA
    16bb765 View commit details
    Browse the repository at this point in the history

  2. Remove usage of delegate methods from redemption

    @Splines
    Splines committed Oct 8, 2024
    Configuration menu
    Copy the full SHA
    b5d5453 View commit details
    Browse the repository at this point in the history

  3. Don't hardcode source_type as string

    @Splines
    Splines committed Oct 8, 2024
    Configuration menu
    Copy the full SHA
    e2786e3 View commit details
    Browse the repository at this point in the history

  4. Refactor voucher_processor into model concern 

    According to concepts discussed in #694.
Also auto-load subdirectories in models folder
and set Current.user for usage in models.
    @Splines
    Splines committed Oct 8, 2024
    Configuration menu
    Copy the full SHA
    d33072d View commit details
    Browse the repository at this point in the history

  5. Add missing notification and subscribe lecture steps

    @Splines
    Splines committed Oct 8, 2024
    Configuration menu
    Copy the full SHA
    0c98e6a View commit details
    Browse the repository at this point in the history

  6. Move vouchers down in UI (lecture edit page)

    @Splines
    Splines committed Oct 8, 2024
    Configuration menu
    Copy the full SHA
    66b6edf View commit details
    Browse the repository at this point in the history

  7. Turn off autocomplete for redeem voucher text field

    @Splines
    Splines committed Oct 8, 2024
    Configuration menu
    Copy the full SHA
    84ab975 View commit details
    Browse the repository at this point in the history

  8. Strip secure hash to avoid copy-pasting issues with voucher

    @Splines
    Splines committed Oct 8, 2024
    Configuration menu
    Copy the full SHA
    ae0b22c View commit details
    Browse the repository at this point in the history

  9. Improve voucher-model docstrings

    @Splines
    Splines committed Oct 8, 2024
    Configuration menu
    Copy the full SHA
    4530ef8 View commit details
    Browse the repository at this point in the history

  10. Fix wrong permit syntax for arrays

    @Splines
    Splines committed Oct 8, 2024
    Configuration menu
    Copy the full SHA
    47784ca View commit details
    Browse the repository at this point in the history

  11. Move Claim model to voucher folder

    @Splines
    Splines committed Oct 8, 2024
    Configuration menu
    Copy the full SHA
    57530f2 View commit details
    Browse the repository at this point in the history

  12. Adapt Redeemer specs to new architecture 

    Also rename Redeemable to Redeemer to better reflect what it's doing.
    @Splines
    Splines committed Oct 8, 2024
    Configuration menu
    Copy the full SHA
    6d0be7e View commit details
    Browse the repository at this point in the history

  13. Use pluck instead of select for better performance 

    Also use .uniq just to be sure.
    @Splines
    Splines committed Oct 8, 2024
    Configuration menu
    Copy the full SHA
    8f9ef78 View commit details
    Browse the repository at this point in the history

  14. Test timestamp in invalidate! voucher spec

    @Splines
    Splines committed Oct 8, 2024
    Configuration menu
    Copy the full SHA
    cab6097 View commit details
    Browse the repository at this point in the history

Commits on Oct 9, 2024

  1. Remove unused routes

    @Splines
    Splines committed Oct 9, 2024
    Configuration menu
    Copy the full SHA
    71fc49a View commit details
    Browse the repository at this point in the history

  2. Fix missing CSpell configuration

    @Splines
    Splines committed Oct 9, 2024
    Configuration menu
    Copy the full SHA
    7df4ee1 View commit details
    Browse the repository at this point in the history

Commits on Oct 12, 2024

  1. Improve tutor voucher redemption messages 

    also remove unused locale keys
    @Splines
    Splines committed Oct 12, 2024
    Configuration menu
    Copy the full SHA
    bd22c93 View commit details
    Browse the repository at this point in the history

  2. Improve speaker voucher redemption messages

    @Splines
    Splines committed Oct 12, 2024
    Configuration menu
    Copy the full SHA
    79d2c8a View commit details
    Browse the repository at this point in the history

  3. Replace "Voucher" by "Gutschein" in German texts

    @Splines
    Splines committed Oct 12, 2024
    Configuration menu
    Copy the full SHA
    ce0c831 View commit details
    Browse the repository at this point in the history

  4. Improve teacher voucher redemption messages

    @Splines
    Splines committed Oct 12, 2024
    Configuration menu
    Copy the full SHA
    ab7c6b4 View commit details
    Browse the repository at this point in the history

  5. Improve editor voucher redemption messages

    @Splines
    Splines committed Oct 12, 2024
    Configuration menu
    Copy the full SHA
    6990a2c View commit details
    Browse the repository at this point in the history

  6. Remove duplicate no_active_voucher i18n key

    @Splines
    Splines committed Oct 12, 2024
    Configuration menu
    Copy the full SHA
    787eb96 View commit details
    Browse the repository at this point in the history

  7. Add help texts to voucher creation

    @Splines
    Splines committed Oct 12, 2024
    Configuration menu
    Copy the full SHA
    57fa450 View commit details
    Browse the repository at this point in the history

Commits on Oct 15, 2024

  1. Also eager_load additional modules 

    This is to ensure that `Rails.application.eager_load!` in the rails_erd
gem respects all our modules.

See this line:
https://github.com/voormedia/rails-erd/blob/7c66258b6818c47b4d878c2ad7ff6decebdf834a/lib/rails_erd/tasks.rake#L45
    @Splines
    Splines committed Oct 15, 2024
    Configuration menu
    Copy the full SHA
    4ed73bc View commit details
    Browse the repository at this point in the history

  2. Outsource x_by_redemption methods from lecture to redemption

    @Splines
    Splines committed Oct 15, 2024
    Configuration menu
    Copy the full SHA
    008ae7d View commit details
    Browse the repository at this point in the history

  3. Fix wrong i18n controller error 

    The code always errored since the JSON objects are passed as strings
from the frontend.
    @Splines
    Splines committed Oct 15, 2024
    Configuration menu
    Copy the full SHA
    ee13d40 View commit details
    Browse the repository at this point in the history

  4. Fix cypress test (due to renaming of i18n keys / html)

    @Splines
    Splines committed Oct 15, 2024
    Configuration menu
    Copy the full SHA
    509a1ec View commit details
    Browse the repository at this point in the history

  5. Cypress test that whitespaces in voucher hash work

    @Splines
    Splines committed Oct 15, 2024
    Configuration menu
    Copy the full SHA
    32f0d00 View commit details
    Browse the repository at this point in the history

  6. Verify voucher is invalid after user became teacher

    @Splines
    Splines committed Oct 15, 2024
    Configuration menu
    Copy the full SHA
    baac57b View commit details
    Browse the repository at this point in the history

  7. Add user deletion cypress spec (for tutor)

    @Splines
    Splines committed Oct 15, 2024
    Configuration menu
    Copy the full SHA
    aa7aec9 View commit details
    Browse the repository at this point in the history

  8. Add word to cspell list

    @Splines
    Splines committed Oct 15, 2024
    Configuration menu
    Copy the full SHA
    ef15a6e View commit details
    Browse the repository at this point in the history

  9. Replace "display" by "show" 

    For me, "display" is closer to the frontend, while this is a backend test,
that's why I renamed it. Not really that important in the end ;)
    @Splines
    Splines committed Oct 15, 2024
    Configuration menu
    Copy the full SHA
    831f5a3 View commit details
    Browse the repository at this point in the history

  10. Fix two spelling mistakes (out of scope)

    @Splines
    Splines committed Oct 15, 2024
    Configuration menu
    Copy the full SHA
    0ba6696 View commit details
    Browse the repository at this point in the history

Commits on Oct 17, 2024

  1. Move lecture notifications to separate file

    @Splines
    Splines committed Oct 17, 2024
    Configuration menu
    Copy the full SHA
    68afdec View commit details
    Browse the repository at this point in the history

  2. Replace Notifier concern by LectureNotifier module

    @Splines
    Splines committed Oct 17, 2024
    Configuration menu
    Copy the full SHA
    11f748d View commit details
    Browse the repository at this point in the history

  3. Remove unused set_recipients method for "new editor mail"

    @Splines
    Splines committed Oct 17, 2024
    Configuration menu
    Copy the full SHA
    7fec453 View commit details
    Browse the repository at this point in the history

Commits on Oct 29, 2024

  1. Move email templates to right folder

    @Splines
    Splines committed Oct 29, 2024
    Configuration menu
    Copy the full SHA
    82d6c67 View commit details
    Browse the repository at this point in the history

  2. Correct sender_nad_locale setting

    @Splines
    Splines committed Oct 29, 2024
    Configuration menu
    Copy the full SHA
    555e26e View commit details
    Browse the repository at this point in the history

  3. Introduce enqueue_mail_with_params matcher & test for editor

    @Splines
    Splines committed Oct 29, 2024
    Configuration menu
    Copy the full SHA
    ae7a5cd View commit details
    Browse the repository at this point in the history

  4. Add spec for Current user model

    @Splines
    Splines committed Oct 29, 2024
    Configuration menu
    Copy the full SHA
    b8c3fbf View commit details
    Browse the repository at this point in the history

  5. Inline sender_and_locale

    @Splines
    Splines committed Oct 29, 2024
    Configuration menu
    Copy the full SHA
    d080a0c View commit details
    Browse the repository at this point in the history

  6. Try to test email sending for editor voucher (fails)

    @Splines
    Splines committed Oct 29, 2024
    Configuration menu
    Copy the full SHA
    663b27f View commit details
    Browse the repository at this point in the history

Commits on Oct 30, 2024

  1. Mock Current model in RSpec tests

    @Splines
    Splines committed Oct 30, 2024
    Configuration menu
    Copy the full SHA
    1d32640 View commit details
    Browse the repository at this point in the history

  2. Rework sender and locale setting

    @Splines
    Splines committed Oct 30, 2024
    Configuration menu
    Copy the full SHA
    8470fc0 View commit details
    Browse the repository at this point in the history

  3. Fix mail sending test for editor

    @Splines
    Splines committed Oct 30, 2024
    Configuration menu
    Copy the full SHA
    7fdfc85 View commit details
    Browse the repository at this point in the history

  4. Test mail body (editor)

    @Splines
    Splines committed Oct 30, 2024
    Configuration menu
    Copy the full SHA
    7264926 View commit details
    Browse the repository at this point in the history

  5. Set locale in broader scope test

    @Splines
    Splines committed Oct 30, 2024
    Configuration menu
    Copy the full SHA
    10d28fb View commit details
    Browse the repository at this point in the history

  6. Fix comment

    @Splines
    Splines committed Oct 30, 2024
    Configuration menu
    Copy the full SHA
    a003fbc View commit details
    Browse the repository at this point in the history

  7. Test previous and new teacher mail

    @Splines
    Splines committed Oct 30, 2024
    Configuration menu
    Copy the full SHA
    a78c767 View commit details
    Browse the repository at this point in the history

  8. Use custom html body matcher (ignore \r\n)

    @Splines
    Splines committed Oct 30, 2024
    Configuration menu
    Copy the full SHA
    7da4d84 View commit details
    Browse the repository at this point in the history

Commits on Oct 31, 2024

  1. Improve wording in html body failure message

    @Splines
    Splines committed Oct 31, 2024
    Configuration menu
    Copy the full SHA
    5350245 View commit details
    Browse the repository at this point in the history

  2. Test mails for co-speakers

    @Splines
    Splines committed Oct 31, 2024
    Configuration menu
    Copy the full SHA
    5b8be7e View commit details
    Browse the repository at this point in the history

  3. Ensure user that is now speaker doesn't receive a mail

    @Splines
    Splines committed Oct 31, 2024
    Configuration menu
    Copy the full SHA
    ccaa9ec View commit details
    Browse the repository at this point in the history

  4. Use just one file for mail matchers

    @Splines
    Splines committed Oct 31, 2024
    Configuration menu
    Copy the full SHA
    c25aa28 View commit details
    Browse the repository at this point in the history

  5. Rename matcher to enqueue_mail_including_params

    @Splines
    Splines committed Oct 31, 2024
    Configuration menu
    Copy the full SHA
    0ce9536 View commit details
    Browse the repository at this point in the history

  6. Outsource from notification mailer assertion

    @Splines
    Splines committed Oct 31, 2024
    Configuration menu
    Copy the full SHA
    7db17b5 View commit details
    Browse the repository at this point in the history

  7. Refactor send mail to co-speaker test

    @Splines
    Splines committed Oct 31, 2024
    Configuration menu
    Copy the full SHA
    a40e13c View commit details
    Browse the repository at this point in the history

  8. Remove unwanted test 

    I accidentally added this even though it's not the
wanted behavior.
    @Splines
    Splines committed Oct 31, 2024
    Configuration menu
    Copy the full SHA
    b9f28e8 View commit details
    Browse the repository at this point in the history

Commits on Nov 5, 2024

  1. Add tests for teacher selection dropdown

    @Splines
    Splines committed Nov 5, 2024
    Configuration menu
    Copy the full SHA
    f7d9d79 View commit details
    Browse the repository at this point in the history

  2. Write test for editor dropdown selection

    @Splines
    Splines committed Nov 5, 2024
    Configuration menu
    Copy the full SHA
    8b2de36 View commit details
    Browse the repository at this point in the history

Commits on Nov 6, 2024

  1. Allow admin to select any user in lecture editor select

    @Splines
    Splines committed Nov 6, 2024
    Configuration menu
    Copy the full SHA
    c1d843f View commit details
    Browse the repository at this point in the history

  2. Remove only from cypress test

    @Splines
    Splines committed Nov 6, 2024
    Configuration menu
    Copy the full SHA
    cd62839 View commit details
    Browse the repository at this point in the history

  3. Add more words to spell checker

    @Splines
    Splines committed Nov 6, 2024
    Configuration menu
    Copy the full SHA
    7d795f7 View commit details
    Browse the repository at this point in the history

  4. Add tests for tutor selection dropdown

    @Splines
    Splines committed Nov 6, 2024
    Configuration menu
    Copy the full SHA
    e265d8c View commit details
    Browse the repository at this point in the history

  5. Add back ability for admin to select any user as tutor

    @Splines
    Splines committed Nov 6, 2024
    Configuration menu
    Copy the full SHA
    f65f573 View commit details
    Browse the repository at this point in the history

  6. Allow admin to choose arbitrary users as speakers & test

    @Splines
    Splines committed Nov 6, 2024
    Configuration menu
    Copy the full SHA
    4f17464 View commit details
    Browse the repository at this point in the history

  7. Remove unnecessary display: none

    @Splines
    Splines committed Nov 6, 2024
    Configuration menu
    Copy the full SHA
    28f1078 View commit details
    Browse the repository at this point in the history

  8. Improve if statement in voucher redemption

    @Splines
    Splines committed Nov 6, 2024
    Configuration menu
    Copy the full SHA
    b12cff8 View commit details
    Browse the repository at this point in the history

  9. Remove another unnecessary "be.visible" statement

    @Splines
    Splines committed Nov 6, 2024
    Configuration menu
    Copy the full SHA
    437deb1 View commit details
    Browse the repository at this point in the history

  10. Allow admins to select arbitrary users in existing talks & test

    @Splines
    Splines committed Nov 6, 2024
    Configuration menu
    Copy the full SHA
    016a142 View commit details
    Browse the repository at this point in the history

  11. Rename lecture spec file

    @Splines
    Splines committed Nov 6, 2024
    Configuration menu
    Copy the full SHA
    ddc48ec View commit details
    Browse the repository at this point in the history

  12. Refactor lecture people select spec (extract methods)

    @Splines
    Splines committed Nov 6, 2024
    Configuration menu
    Copy the full SHA
    95eaa1f View commit details
    Browse the repository at this point in the history

Commits on Nov 9, 2024

  1. Reuse speaker_select helper

    @Splines
    Splines committed Nov 9, 2024
    Configuration menu
    Copy the full SHA
    58091e6 View commit details
    Browse the repository at this point in the history

  2. Outsource to new teacher_select helper

    @Splines
    Splines committed Nov 9, 2024
    Configuration menu
    Copy the full SHA
    7d53f83 View commit details
    Browse the repository at this point in the history

  3. Outsource to new editors_select helper

    @Splines
    Splines committed Nov 9, 2024
    Configuration menu
    Copy the full SHA
    1ae8f91 View commit details
    Browse the repository at this point in the history

  4. Remove with_seminar trait 

    (since we use the association field now, introduced
a few commits beforehand)
    @Splines
    Splines committed Nov 9, 2024
    Configuration menu
    Copy the full SHA
    6c6a7c8 View commit details
    Browse the repository at this point in the history

  5. Make cypress input selecting more reliable

    @Splines
    Splines committed Nov 9, 2024
    Configuration menu
    Copy the full SHA
    34b5b72 View commit details
    Browse the repository at this point in the history

  6. Remove unnecessary div wrap

    @Splines
    Splines committed Nov 9, 2024
    Configuration menu
    Copy the full SHA
    7c898fd View commit details
    Browse the repository at this point in the history

  7. Avoid flaky test by intercepting user fill request

    @Splines
    Splines committed Nov 9, 2024
    Configuration menu
    Copy the full SHA
    43ac12f View commit details
    Browse the repository at this point in the history

  8. Fix cypress not typing "cy" in input box

    @Splines
    Splines committed Nov 9, 2024
    Configuration menu
    Copy the full SHA
    f1366b0 View commit details
    Browse the repository at this point in the history

  9. Remove current_user= test as method was removed

    @Splines
    Splines committed Nov 9, 2024
    Configuration menu
    Copy the full SHA
    cc82b94 View commit details
    Browse the repository at this point in the history

  10. Intercept /talks/new route to avoid flaky test 

    This is due to the form not being completely loaded while we
already go on.
    @Splines
    Splines committed Nov 9, 2024
    Configuration menu
    Copy the full SHA
    68e161d View commit details
    Browse the repository at this point in the history

  11. Add cy.wait as last resort

    @Splines
    Splines committed Nov 9, 2024
    Configuration menu
    Copy the full SHA
    c496959 View commit details
    Browse the repository at this point in the history

  12. Visit #people page directly

    @Splines
    Splines committed Nov 9, 2024
    Configuration menu
    Copy the full SHA
    c864be8 View commit details
    Browse the repository at this point in the history

  13. Remove unwanted only in Cypress test

    @Splines
    Splines committed Nov 9, 2024
    Configuration menu
    Copy the full SHA
    f7a71ca View commit details
    Browse the repository at this point in the history