[ENG-6164] allow monthly metrics reports on multiple subjects #10718
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
aaxelb
force-pushed
the
feature/unique-together-monthly-reports
branch
2 times, most recently
from
45854c5
to
c1745fe
Compare
replace `DailyReport.DAILY_UNIQUE_FIELDS` with `UNIQUE_TOGETHER_FIELDS` on both `DailyReport` and `MonthlyReport`, so we can have (for example) monthly reports for each institution or each institutional user account
aaxelb
force-pushed
the
feature/unique-together-monthly-reports
branch
from
c1745fe
to
9923f46
Compare
Johnetordoff
approved these changes
Aug 26, 2024
| except AttributeError: | ||
| pass | ||
| else: | ||
| # Set the document id to a hash of "unique together" fields |
There was a problem hiding this comment.
Seems like a lot of comments for a simple set_id function, there's a code smell here that this is over engineered.
| @@ -46,9 +46,9 @@ def __str__(self): | |||
| return f'{self.year}-{self.month:0>2}' | |||
|
|
|||
| def target_month(self): | |||
| return datetime.datetime(self.year, self.month, 1, tzinfo=pytz.utc) | |||
There was a problem hiding this comment.
Why is this changing?
| assert blah_report.meta.id == expected_blah | ||
| mock_save.reset_mock() | ||
|
|
||
| expected_fleh = '385700db282f6d6089a0d21836db5ee8423f548615e515b6e034bcc90a14500f' |
There was a problem hiding this comment.
What makes this different, break these up by case.
| @@ -66,26 +72,31 @@ class Meta: | |||
| dynamic = metrics.MetaField('strict') | |||
| source = metrics.MetaField(enabled=True) | |||
|
|
|||
| def __init_subclass__(cls, **kwargs): | |||
| super().__init_subclass__(**kwargs) | |||
| assert 'report_yearmonth' in cls.UNIQUE_TOGETHER_FIELDS, f'MonthlyReport subclasses must have "report_yearmonth" in UNIQUE_TOGETHER_FIELDS (on {cls.__qualname__}, got {cls.UNIQUE_TOGETHER_FIELDS})' | |||
There was a problem hiding this comment.
Seems unnecessary KISS.
Johnetordoff
merged commit a29eb75
into
CenterForOpenScience:feature/insti-dash-improv
6 checks passed
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.
Purpose
allow monthly reports for each institution or each institutional user account
Changes
replace
DailyReport.DAILY_UNIQUE_FIELDSwithUNIQUE_TOGETHER_FIELDSon bothDailyReportandMonthlyReportQA Notes
Please make verification statements inspired by your code and what your code touches.
What are the areas of risk?
Any concerns/considerations/questions that development raised?
Documentation
Side Effects
Ticket