feat: allow orgs to not have a main contact if imported from an aggregator #10531
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
4nt0ineB
added
🏭 Producers Platform
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## main #10531 +/- ##
==========================================
- Coverage 49.54% 49.25% -0.29%
==========================================
Files 67 76 +9
Lines 20650 21868 +1218
Branches 4980 5238 +258
==========================================
+ Hits 10231 10772 +541
- Misses 9131 9774 +643
- Partials 1288 1322 +34 ☔ View full report in Codecov by Sentry. |
alexgarel
approved these changes
Jul 10, 2024
| use ProductOpener::Orgs qw/list_org_ids retrieve_org/; | ||
| use ProductOpener::Paths qw/%BASE_DIRS/; | ||
|
|
||
| my @not_users = qw(agena3000 equadis codeonline bayard database-usda countrybot); |
There was a problem hiding this comment.
Don't you want to add any @openfoodfacts.org user ?
Comment on lines
41
to
44
| not defined $org_ref->{main_contact} # undefined | ||
| or $org_ref->{main_contact} =~ /^\s*$/ # empty or only whitespace | ||
| or $org_ref->{main_contact} =~ /[\p{Z}\p{C}]/ # contains unicode whitespace or control characters | ||
| or grep {$org_ref->{main_contact} eq $_} @not_users |
There was a problem hiding this comment.
It's better to parenthesis maybe (it's what we generally do, better be consistent)
Suggested change
| not defined $org_ref->{main_contact} # undefined | |
| or $org_ref->{main_contact} =~ /^\s*$/ # empty or only whitespace | |
| or $org_ref->{main_contact} =~ /[\p{Z}\p{C}]/ # contains unicode whitespace or control characters | |
| or grep {$org_ref->{main_contact} eq $_} @not_users | |
| (not defined $org_ref->{main_contact}) # undefined | |
| or ($org_ref->{main_contact} =~ /^\s*$/) # empty or only whitespace | |
| or ($org_ref->{main_contact} =~ /[\p{Z}\p{C}]/) # contains unicode whitespace or control characters | |
| or (grep {$org_ref->{main_contact} eq $_} @not_users) |
| ) | ||
| { | ||
|
|
||
| $org_ref->{main_contact} = undef; |
There was a problem hiding this comment.
In the case of an empty contact, don't you wan't to see if there are people in the admins group ? (and maybe, just log for now, and report this to producers team).
There was a problem hiding this comment.
Ah thanks, I completely forgot, that's what I wanted to do initially :)
Co-authored-by: Alex Garel <[email protected]>
| # and set it as main contact | ||
|
|
||
| my $admin = undef; | ||
| foreach my $admin_id (@{$org_ref->{admins}}) { |
There was a problem hiding this comment.
@{$org_ref->{admins} is a hash, changing to sort keys %{$org_ref->{admins}}
stephanegigandet
pushed a commit
that referenced
this pull request
Jul 23, 2024
🤖 I have created a release *beep* *boop* --- ## [2.38.0](v2.37.0...v2.38.0) (2024-07-23) ### Features * add new product event types for redis queue ([#10530](#10530)) ([339dbc4](339dbc4)) * add product data to org table ([#10534](#10534)) ([dce0518](dce0518)) * added a drag and drop zone in pro platform ([#10569](#10569)) ([ce60b8f](ce60b8f)) * allow orgs to not have a main contact if imported from an aggregator ([#10531](#10531)) ([ead1b0c](ead1b0c)) * launch the exports for all organizations that have the checkbox… ([#10561](#10561)) ([c3aa2d1](c3aa2d1)) * Lint spaces in taxonomies ([#10563](#10563)) ([c01cf91](c01cf91)) * make valid org filter field a dropdown ([#10524](#10524)) ([b38e62c](b38e62c)) * measure and log duration of request and mongodb / off-query que… ([#10557](#10557)) ([2cb1b1e](2cb1b1e)) * packaging add Ireland ([#10533](#10533)) ([3f3196e](3f3196e)), closes [#1572](#1572) ### Bug Fixes * add product_type to redis events ([#10550](#10550)) ([6bd1c0e](6bd1c0e)) * added barcode-svg ([#10242](#10242)) ([8da89da](8da89da)) * broken user space on pro platform ([#10541](#10541)) ([b6e3017](b6e3017)) * change_main_contact.pl ([#10548](#10548)) ([b2f90ea](b2f90ea)) * disable caching on pro platform ([#10516](#10516)) ([4ccd714](4ccd714)) * GDSN import from Alnatura ([#10556](#10556)) ([6e2673a](6e2673a)) * improve generated data for a .pl script ([#10532](#10532)) ([1cab04c](1cab04c)) * pro_moderator_owner not stored for the admin/moderator user through org/[orgid] facet ([#10560](#10560)) ([e0441c6](e0441c6)) * rate limiter log config ([#10535](#10535)) ([9a5168d](9a5168d)) --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please).
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.
What
This script must be run in prod:
scripts/migrations/2024_07_change_main_contact.pl