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

187186207/iter1 golden repo fixes #38

Merged
merged 11 commits into from
Mar 13, 2024
Merged

Conversation

JacksonXu33
Copy link

@JacksonXu33 JacksonXu33 commented Mar 8, 2024

[Pivotal Tracker Link][tracker]

https://www.pivotaltracker.com/n/projects/2406982/stories/187186207

What this PR does:

This pull request fixes the iteration 1 pull request initial comments issues. Includes mostly comment deletes and white space fixing and other syntax related things. There was a migration edit and migration delete, which will involve some careful maneuvering with "git pull" when you pull from main.

How should this PR be tested?

Mostly just removed comments and fixed up whitespacing.

Are there any complications to deploying this?

Don't know if it's fully necessary, but just to be safe to not mess up your own local database,
If we merge this branch to main, then follow these steps before running "git pull":

  • Locally run "rails db:rollback" twice,
  • followed by "git pull",
  • followed with "rails db:migrate" once,
  • and maybe with another "rails db:seed"

Some edits, see above steps for it.

Checklist:

  • Has this been deployed to a staging environment or reviewed by a customer?
  • Tag someone for code review (either a coach / team member)
  • I have renamed the branch to match PivotTracker's suggested one (necessary for BlueJay) (e.g. michael/12345-add-new-feature Any branch name will do as long as the story ID is there. You can use git checkout -b [new-branch-name])

Copy link

codecov bot commented Mar 8, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 87.42%. Comparing base (df52d67) to head (af46dfe).
Report is 32 commits behind head on main.

Additional details and impacted files
@@            Coverage Diff             @@
##             main      #38      +/-   ##
==========================================
+ Coverage   85.77%   87.42%   +1.64%     
==========================================
  Files          20       20              
  Lines         668      803     +135     
==========================================
+ Hits          573      702     +129     
- Misses         95      101       +6     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@ArushC
Copy link

ArushC commented Mar 8, 2024

LGTM, I think you got everything. I'll make a PR from this branch directly to the Golden Repo.

@perryzjc
Copy link
Member

perryzjc commented Mar 8, 2024

Looks good to me as well. It seems to fix everything mentioned in Professor Ball's Initial comments.

If anything else is needed, I think we need some notes to document what admins need to do after the PR, especially about the migration.

Based on the discussions we had in today's lecture with Michael (Friday, Mar 8), Michael suggested we just document the manual steps to update the email template (since there are only quite a few templates right now), such as the values to fill out for the new to field.

We could possibly write something for the Are there any complications to deploying this? section as below:

  1. Run "rails db:migrate" since there are schema changes (a new TO field)
  2. (Optional) Run rails db:reseed if you want to directly import the updated email templates we made (updated email content, new template, and the pre-filled to fields)
  3. (Alternative way to step 2) Manually update the existing email template with the new content.
    • After running step 1 (migrate), for the new to field, fill in {{teacher_email}}, {{teacher_personal_email}} as the template value, or some default emails, e.g. [email protected], [email protected]
    • Also need to update the template content for Denial Email and Request More Info Email, as they no longer use the original reason field, but the denial_reason or request_reason instead. Sample format can be found at the seed_data.rb we provided, such as:
  @deny_email = <<-DENY_EMAIL1
    <p>Dear [Recipient's Name],</p>
    <p>Thank you for your email. We have received your message and we are sorry to inform you that your application has been rejected.</p>
    <p>Best regards,</p>
    <p>[Your Name]</p>
    <p>Below, you can find the reason as to why it was rejected </p>
    <p>
      {{ denial_reason | strip_tags}}
    </p>
  DENY_EMAIL1

@ArushC ArushC merged commit 5135d22 into main Mar 13, 2024
8 checks passed
@ArushC ArushC deleted the 187186207/iter1-golden-repo-fixes branch March 13, 2024 22:09
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.

4 participants