fix 539598e (#10431)

Author: chibie

app/dashboard/notifications.py

@@ -31,10 +31,9 @@
 import twitter
 from economy.utils import convert_token_to_usdt
 from git.utils import delete_issue_comment, org_name, patch_issue_comment, post_issue_comment, repo_name
+from marketing.common.utils import allowed_to_send_email
 from marketing.mails import featured_funded_bounty, send_mail, setup_lang, tip_email
 from marketing.models import GithubOrgToTwitterHandleMapping
-from marketing.common.utils import allowed_to_send_email
-
 from pyshorteners import Shortener
 from retail.emails import render_new_kudos_email
 from slackclient import SlackClient

app/grants/models/contribution.py

@@ -1,3 +1,5 @@
+from datetime import timedelta
+
 from django.conf import settings
 from django.contrib.postgres.fields import JSONField
 from django.db import models
@@ -7,8 +9,6 @@
 from django.utils.translation import gettext_lazy as _
 
 import requests
-from datetime import timedelta
-
 from economy.models import SuperModel, Token
 from economy.tx import check_for_replaced_tx
 from townsquare.models import Comment
@@ -180,17 +180,13 @@ def leave_gitcoinbot_comment_for_status(self, status):
             comment = f"Transaction status: {status} (as of {timezone.now().strftime('%Y-%m-%d %H:%m %Z')})"
             profile = Profile.objects.get(handle='gitcoinbot')
             activity = self.subscription.activities.first()
-            # delete all before recreating
-            Comment.objects.filter(
+            Comment.objects.update_or_create(
                 profile=profile,
                 activity=activity,
-            ).delete()
-            # create new entry
-            Comment.objects.create(
-                profile=profile,
-                activity=activity,
-                comment=comment,
-                is_edited=True
+                defaults={
+                    "comment": comment,
+                    "is_edited": True,
+                }
             )
         except Exception as e:
             print(e)

app/marketing/common/earnings.py

@@ -1,5 +1,5 @@
-import io
 import csv
+import io
 import logging
 
 from django.conf import settings

app/marketing/management/commands/bounty_feedback_email.py

@@ -20,8 +20,8 @@
 from django.utils import timezone
 
 from dashboard.models import Bounty
-from marketing.mails import bounty_feedback
 from marketing.common.utils import handle_bounty_feedback
+from marketing.mails import bounty_feedback
 
 
 class Command(BaseCommand):

app/marketing/management/commands/send_quarterly_stats.py

@@ -21,9 +21,9 @@
 from django.core.management.base import BaseCommand
 
 from dashboard.models import Profile
+from marketing.common.utils import get_platform_wide_stats
 from marketing.mails import quarterly_stats
 from marketing.models import LeaderboardRank
-from marketing.common.utils import get_platform_wide_stats
 
 warnings.filterwarnings("ignore", category=DeprecationWarning)
 

app/marketing/management/commands/sync_mail.py

@@ -20,8 +20,8 @@
 from django.utils import timezone
 
 from mailchimp3 import MailChimp
-from marketing.models import EmailSubscriber
 from marketing.common.utils import get_or_save_email_subscriber as process_email
+from marketing.models import EmailSubscriber
 
 hours_ago = 12 #if you change, this make sure you change the crontab file to ...
 # make it inclusive of all users since last run of this job

app/marketing/management/commands/unsubscribe_daily_emails.py

@@ -23,9 +23,9 @@
 from django.core.management.base import BaseCommand
 from django.utils import timezone
 
+from marketing.common.utils import allowed_to_send_email
 from marketing.mails import gdpr_reconsent
 from marketing.models import EmailEvent, EmailSubscriber
-from marketing.common.utils import allowed_to_send_email
 
 warnings.filterwarnings("ignore", category=DeprecationWarning)
 

app/marketing/tasks.py

@@ -1,6 +1,6 @@
 import csv
-import os
 import io
+import os
 
 from django.conf import settings
 from django.contrib.auth.models import User
@@ -10,11 +10,11 @@
 from app.services import RedisService
 from celery import app
 from celery.utils.log import get_task_logger
+from marketing.common.earnings import export_earnings, send_csv, send_download_failure_email
+from marketing.common.utils import allowed_to_send_email
 from marketing.mails import new_bounty_daily as new_bounty_daily_email
 from marketing.mails import weekly_roundup as weekly_roundup_email
 from marketing.models import EmailSubscriber
-from marketing.common.utils import allowed_to_send_email
-from marketing.common.earnings import export_earnings, send_csv, send_download_failure_email
 
 logger = get_task_logger(__name__)
 

app/marketing/tests/tasks/test_export_earnings_to_csv_task.py

@@ -29,8 +29,8 @@
 from celery.exceptions import MaxRetriesExceededError
 from dashboard.tests.factories import EarningFactory, ProfileFactory
 from grants.tests.factories import GrantFactory
-from marketing.tasks import send_earnings_csv
 from marketing.common.earnings import export_earnings, send_csv
+from marketing.tasks import send_earnings_csv
 
 
 @pytest.fixture

app/marketing/tests/test_marketing_utils.py

@@ -17,8 +17,8 @@
 along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 """
-from marketing.models import EmailSubscriber, Stat
 from marketing.common.utils import allowed_to_send_email, func_name, get_or_save_email_subscriber, get_stat
+from marketing.models import EmailSubscriber, Stat
 from test_plus.test import TestCase
 
 

app/marketing/views.py

@@ -44,11 +44,11 @@
 from gas.utils import recommend_min_gas_price_to_confirm_in_time
 from git.utils import get_github_primary_email
 from grants.models import Grant
+from marketing.common.utils import delete_email_subscription, get_or_save_email_subscriber, validate_slack_integration
 from marketing.country_codes import COUNTRY_CODES, COUNTRY_NAMES, FLAG_API_LINK, FLAG_ERR_MSG, FLAG_SIZE, FLAG_STYLE
 from marketing.mails import new_feedback
 from marketing.models import AccountDeletionRequest, EmailSubscriber, Keyword, LeaderboardRank, UpcomingDate
 from marketing.tasks import send_earnings_csv
-from marketing.common.utils import delete_email_subscription, get_or_save_email_subscriber, validate_slack_integration
 from retail.emails import render_new_bounty
 from retail.helpers import get_ip
 from townsquare.models import Announcement

app/retail/emails.py

@@ -36,8 +36,8 @@
 import premailer
 from app.utils import get_default_network
 from grants.models import Contribution, Grant, Subscription
-from marketing.models import LeaderboardRank
 from marketing.common.utils import get_or_save_email_subscriber
+from marketing.models import LeaderboardRank
 from perftools.models import StaticJsonEnv
 from retail.utils import build_utm_tracking, strip_double_chars, strip_html
 

app/tdi/views.py

@@ -32,8 +32,8 @@
 from django.utils.translation import gettext
 from django.utils.translation import gettext_lazy as _
 
-from marketing.mails import send_mail, setup_lang
 from marketing.common.utils import invite_to_slack
+from marketing.mails import send_mail, setup_lang
 from PyPDF2 import PdfFileReader, PdfFileWriter
 from ratelimit.decorators import ratelimit
 from reportlab.lib.colors import Color

scripts/debug/output_weekly_mailing_list.py

@@ -1,8 +1,8 @@
 f = open("output.csv", "w")
 import time
 
-from marketing.models import EmailSubscriber
 from marketing.common.utils import allowed_to_send_email, func_name, get_or_save_email_subscriber
+from marketing.models import EmailSubscriber
 
 queryset = EmailSubscriber.objects.all()
 count = queryset.count()