feat(proposals): Remove remoting_policy

lingin1230 · Feb 27, 2022 · bfe7a52 · bfe7a52
1 parent 51aa33b
commit bfe7a52
Show file tree

Hide file tree

Showing 9 changed files with 6 additions and 47 deletions.
diff --git a/src/core/models.py b/src/core/models.py
@@ -204,17 +204,6 @@ class EventInfo(models.Model):
         auto_now=True,
     )
 
-    REMOTE_POLICY_CHOICES = (
-        (True, _('Yes')),
-        (False, _('No'))
-    )
-
-    remoting_policy = models.BooleanField(
-        verbose_name=_('remoting policy'),
-        default=False,
-        choices=REMOTE_POLICY_CHOICES
-    )
-
     PERFER_TIME_CHOICES = (
         ('DAY_ONE_MORNING', _('Day 1 morning')),
         ('DAY_ONE_AFTERNOON', _('Day 1 afternoon')),

diff --git a/src/events/api/serializers.py b/src/events/api/serializers.py
@@ -103,23 +103,14 @@ def get_speakers(self, obj):
         request = self.context.get('request')
         return format_speakers_data(request, [obj.host])
 
-    def to_representation(self, obj):
-        """
-        Assign the value of `SponsoredEvent.remoting_policy` as `is_remote`
-        """
-        representation = super().to_representation(obj)
-        is_remote = representation.pop('remoting_policy')
-        representation['is_remote'] = is_remote
-        return representation
-
     class Meta:
         model = SponsoredEvent
         fields = [
             "id", "title", "category", "language", "python_level",
             "recording_policy", "abstract", "detailed_description",
             "slide_link", "slido_embed_link", "hackmd_embed_link",
             "speakers", "location", "begin_time", "end_time",
-            "remoting_policy", "event_type", 'youtube_id',
+            "event_type", 'youtube_id',
         ]
 
 

diff --git a/src/proposals/admin.py b/src/proposals/admin.py
@@ -22,7 +22,6 @@ class ProposalAdmin(admin.ModelAdmin):
         'duration',
         'language',
         'python_level',
-        'remoting_policy',
         'accepted',
     ]
     list_filter = [
@@ -44,7 +43,6 @@ class TalkProposalAdmin(ExportMixin, ProposalAdmin):
         'duration',
         'language',
         'python_level',
-        'remoting_policy',
         'first_time_speaker',
         'accepted',
     ]

diff --git a/src/proposals/forms/mixins.py b/src/proposals/forms/mixins.py
@@ -121,10 +121,6 @@ class Meta:
                 "target='_blank' rel='noopener'>Markdown</a>. "
                 "This is NOT made public and for REVIEW ONLY.</p>"
             ),
-            'remoting_policy': _(
-                "Whether you agree to deliver the talk remotely if the epidemic "
-                "(coronavirus) is still raging this August?"
-            ),
             'live_stream_policy': _(
                 "If you disagree to authorize PyCon Taiwan to record video, "
                 "whether you agree to let PyCon Taiwan live stream your presentation "
@@ -233,11 +229,6 @@ class Meta:
                 "target='_blank' rel='noopener'>Markdown</a>. "
                 "This is NOT made public and for REVIEW ONLY."
             ),
-            'remoting_policy': _(
-                "Whether you agree to deliver the tutorial remotely if the epidemic "
-                "(coronavirus) is still raging this August?"
-
-            ),
             'live_stream_policy': _(
                 "If you disagree to authorize PyCon Taiwan to record video, "
                 "whether you agree to let PyCon Taiwan live stream your presentation "

diff --git a/src/proposals/forms/proposals.py b/src/proposals/forms/proposals.py
@@ -45,7 +45,6 @@ class Meta(TalkProposalMixin.Meta):
             'python_level',
             'recording_policy',
             'live_stream_policy',
-            'remoting_policy',
             'first_time_speaker',
             'referring_policy',
             'prefer_time',
@@ -73,7 +72,6 @@ class Meta(TutorialProposalMixin.Meta):
             'python_level',
             'recording_policy',
             'live_stream_policy',
-            'remoting_policy',
             'prefer_time',
             'living_in_taiwan',
             'pre_recorded_policy',
@@ -115,7 +113,6 @@ class Meta(TalkProposalMixin.Meta):
             'supplementary',
             'recording_policy',
             'live_stream_policy',
-            'remoting_policy',
             'first_time_speaker',
             'slide_link',
             'referring_policy',
@@ -148,7 +145,6 @@ class Meta(TutorialProposalMixin.Meta):
             'supplementary',
             'recording_policy',
             'live_stream_policy',
-            'remoting_policy',
             'slide_link',
             'prefer_time',
             'living_in_taiwan',

diff --git a/src/proposals/resources.py b/src/proposals/resources.py
@@ -67,6 +67,6 @@ class Meta:
             'stage_1_minus_0_count', 'stage_1_minus_1_count',
             'stage_2_plus_1_count', 'stage_2_plus_0_count',
             'stage_2_minus_0_count', 'stage_2_minus_1_count',
-            'remoting_policy', 'first_time_speaker', 'referring_policy'
+            'first_time_speaker', 'referring_policy'
         ]
         export_order = fields
diff --git a/src/proposals/tests/forms/test_proposal.py b/src/proposals/tests/forms/test_proposal.py
@@ -19,7 +19,6 @@ def talk_proposal_data():
         'recording_policy': True,
         'live_stream_policy': True,
         'referring_policy': True,
-        'remoting_policy': True,
         'first_time_speaker': True,
     }
 
@@ -28,7 +27,7 @@ def test_talk_proposal_create_form():
     form = TalkProposalCreateForm()
     assert list(form.fields) == [
         'title', 'category', 'duration', 'language', 'python_level', 'recording_policy',
-        'live_stream_policy', 'remoting_policy', 'first_time_speaker', 'referring_policy',
+        'live_stream_policy', 'first_time_speaker', 'referring_policy',
     ]
 
 
@@ -69,15 +68,14 @@ def tutorial_proposal_data():
         'python_level': 'INTERMEDIATE',
         'recording_policy': True,
         'live_stream_policy': True,
-        'remoting_policy': True,
     }
 
 
 def test_tutorial_proposal_create_form():
     form = TutorialProposalCreateForm()
     assert list(form.fields) == [
         'title', 'category', 'duration', 'language',
-        'python_level', 'recording_policy', 'live_stream_policy', 'remoting_policy',
+        'python_level', 'recording_policy', 'live_stream_policy',
     ]
 
 
@@ -118,7 +116,7 @@ def test_talk_proposal_update_form():
     assert list(form.fields) == [
         'title', 'category', 'duration', 'language', 'abstract', 'python_level',
         'objective', 'detailed_description', 'outline', 'supplementary',
-        'recording_policy', 'live_stream_policy', 'remoting_policy', 'first_time_speaker',
+        'recording_policy', 'live_stream_policy', 'first_time_speaker',
         'slide_link', 'referring_policy',
     ]
 
@@ -128,7 +126,7 @@ def test_tutorial_proposal_update_form():
     assert list(form.fields) == [
         'title', 'category', 'duration', 'language', 'abstract', 'python_level',
         'objective', 'detailed_description', 'outline', 'supplementary',
-        'recording_policy', 'live_stream_policy', 'remoting_policy', 'slide_link',
+        'recording_policy', 'live_stream_policy', 'slide_link',
     ]
 
 

diff --git a/src/proposals/tests/views/test_create.py b/src/proposals/tests/views/test_create.py
@@ -95,7 +95,6 @@ def test_talk_proposal_create_post(agreed_user, agreed_user_client):
         'recording_policy': True,
         'live_stream_policy': True,
         'referring_policy': False,
-        'remoting_policy': True,
         'first_time_speaker': True,
     }, follow=True)
 
@@ -125,7 +124,6 @@ def test_tutorial_proposal_create_post(agreed_user, agreed_user_client):
         'python_level': 'INTERMEDIATE',
         'recording_policy': True,
         'live_stream_policy': True,
-        'remoting_policy': True,
     }, follow=True)
 
     proposal = TutorialProposal.objects.get(

diff --git a/src/proposals/tests/views/test_edit.py b/src/proposals/tests/views/test_edit.py
@@ -177,7 +177,6 @@ def test_talk_proposal_edit_post(agreed_user_client, talk_proposal):
         'recording_policy': True,
         'live_stream_policy': True,
         'referring_policy': False,
-        'remoting_policy': True,
         'first_time_speaker': True,
         'abstract': (
             "In the modern world, programmer’s time is more expensive than "
@@ -223,7 +222,6 @@ def test_tutorial_proposal_edit_post(agreed_user_client, tutorial_proposal):
         'python_level': 'INTERMEDIATE',
         'recording_policy': True,
         'live_stream_policy': True,
-        'remoting_policy': True,
         'abstract': (
             "In the modern world, programmer’s time is more expensive than "
             "computer’s time. Better maintainability saves more. To improve "