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

Updating met repo with all changes on epic engage #2348

Merged
merged 18 commits into from
Jan 10, 2024

Conversation

VineetBala-AOT
Copy link
Collaborator

Issue #: https://github.com/bcgov/met-public/issues/

Description of changes:

  1. Survey Result Tracking:
  • Implemented a new analytics table to comprehensively track all available options for multiple-choice questions in the survey results.
  • This enhancement ensures the display of options on the survey result graph, even if none of the users have selected a specific option.
  • Corresponding ETL (Extract, Transform, Load) changes have been incorporated to seamlessly integrate this new table.
  1. Rejection Email Template for Closed Engagements:
  • Introduced a new rejection email template specifically designed for closed engagements.
  • If a user's comment is rejected after the engagement is closed, the new email template is triggered. It informs the user about the rejection without providing an option to edit the comment, considering the closure of the engagement period.
  1. CSV Export Format for Proponent:
  • Revamped the CSV export format for proponents to be in Excel format.
  • Implemented additional formatting changes on the Excel file to enhance readability and presentation.
  1. Formio Version Update:
  • Upgraded the Formio version to ensure the latest features, improvements, and security updates are incorporated.
  1. Survey Editing for Open Engagements:
  • Enabled the editing of surveys linked to open engagements, providing superusers with the flexibility to modify the survey during the open engagement period.

By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of the met-public license (Apache 2.0).

@Baelx Baelx marked this pull request as draft January 9, 2024 00:32
@Baelx
Copy link
Collaborator

Baelx commented Jan 9, 2024

@VineetBala-AOT Thanks for submitting this with the great summary. I've moved it to a draft PR just to prevent it from being merged accidentally.

FYI this PR has been submitted for review only at the moment. Vineet has said this includes general improvements brought over from the Epic project. Could members of the DES team please not approve/merge this PR until Steve and I have had a chance to review it.

@Baelx Baelx marked this pull request as ready for review January 9, 2024 18:29
@@ -36,7 +37,7 @@
os.environ = {k: v for k, v in os.environ.items() if v}


def get_named_config(environment: str | None) -> 'Config':
def get_named_config(environment: Union[str, None]) -> 'Config':
Copy link
Collaborator

Choose a reason for hiding this comment

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

A couple of the team members have had issues with this. Do you know what the underlying problem is? Is the Python version not recognizing the union type hint syntax?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Yes, I believe its because of the python version.

"""
Initialize the object.

This method is called when an object is created. It sets up the initial
Copy link
Collaborator

Choose a reason for hiding this comment

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

Comments are always appreciated! Especially to add more context to an existing file


# TODO: Populate or remove this method dependent on changes resulting from adding the new Engagement metadata
return query
# TODO: Populate or remove this method dependent on changes resulting from adding the new Engagement metadata
Copy link
Collaborator

Choose a reason for hiding this comment

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

Thanks for this! Nice of you to fix little issues like this :)

Copy link
Collaborator

@Baelx Baelx left a comment

Choose a reason for hiding this comment

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

Thanks for merging this in, @VineetBala-AOT. It's especially nice that you corrected preexisting linting errors and did some small code clean ups when you didn't have to. Appreciated!

Could you please just update the CHANGELOG? Please follow the current format of the log, with the date as header, then a brief description of the work and a link to the ticket. I've created a ticket to capture this work in Jira: https://apps.itsm.gov.bc.ca/jira/browse/DESENG-468

@codecov-commenter
Copy link

codecov-commenter commented Jan 9, 2024

Codecov Report

Attention: 15 lines in your changes are missing coverage. Please review.

Comparison is base (f7e3ac7) 68.56% compared to head (5ba0b6a) 68.90%.
Report is 5 commits behind head on main.

Additional details and impacted files
@@            Coverage Diff             @@
##             main    #2348      +/-   ##
==========================================
+ Coverage   68.56%   68.90%   +0.33%     
==========================================
  Files         472      510      +38     
  Lines       15593    15968     +375     
  Branches     1193     1165      -28     
==========================================
+ Hits        10691    11002     +311     
- Misses       4693     4757      +64     
  Partials      209      209              
Flag Coverage Δ
analyticsapi 78.72% <45.83%> (?)

Flags with carried forward coverage won't be shown. Click here to find out more.

Files Coverage Δ
.../analytics_api/models/available_response_option.py 100.00% <100.00%> (ø)
met-api/src/met_api/__init__.py 97.18% <ø> (-0.12%) ⬇️
met-api/src/met_api/config.py 100.00% <ø> (+3.22%) ⬆️
met-api/src/met_api/models/__init__.py 100.00% <ø> (ø)
met-api/src/met_api/models/base_model.py 92.30% <ø> (+0.92%) ⬆️
met-api/src/met_api/models/engagement.py 76.13% <ø> (+0.61%) ⬆️
met-api/src/met_api/models/engagement_metadata.py 60.00% <ø> (-1.54%) ⬇️
met-api/src/met_api/models/engagement_slug.py 100.00% <100.00%> (ø)
met-api/src/met_api/models/feedback.py 90.74% <ø> (ø)
met-api/src/met_api/resources/__init__.py 100.00% <ø> (ø)
... and 57 more

... and 35 files with indirect coverage changes

Copy link

sonarcloud bot commented Jan 10, 2024

Quality Gate Passed Quality Gate passed

Kudos, no new issues were introduced!

0 New issues
0 Security Hotspots
No data about Coverage
No data about Duplication

See analysis details on SonarCloud

@VineetBala-AOT VineetBala-AOT merged commit b2b30bc into bcgov:main Jan 10, 2024
15 of 19 checks passed
NatSquared pushed a commit that referenced this pull request Jan 19, 2024
* Changes to show all survey results to superusers

* removing hard coded values

* fixing linting

* splitting to seperate end points

* Handle no data error for graphs

* adding new nodata component

* adding new email for submission response

* fixing linting and testing

* Upgrades to Issue Tracking Table

* removing try catch

* removing changes for email verification

* updating

* Merging bug fixes from epic engage

* Updating comment service to remove metadata

* fixing met-api linting

* Updating change log

* Updating comment

* fixing linting for analytics
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.

3 participants