Ft priority team members #158174599

Procfile

@@ -1,2 +1,2 @@
-release: bash ./pre-release.sh
+release: ./manage.py migrate
 web: gunicorn hc.wsgi:application

hc/accounts/forms.py

@@ -30,5 +30,16 @@ class RemoveTeamMemberForm(forms.Form):
     email = LowercaseEmailField()
 
 
+class AssignChecksForm(forms.Form):
+    email = LowercaseEmailField()
+    check_code = forms.UUIDField(required=False)
+    priority = forms.IntegerField(min_value=0, max_value=5)
+
+
+class UnAssignChecksForm(forms.Form):
+    email = LowercaseEmailField()
+    check_code = forms.UUIDField(required=False)
+
+
 class TeamNameForm(forms.Form):
     team_name = forms.CharField(max_length=200, required=True)

hc/accounts/migrations/0009_merge_20180711_1206.py

@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10 on 2018-07-11 12:06
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('accounts', '0008_auto_20180703_1212'),
+        ('accounts', '0008_auto_20180703_0928'),
+    ]
+
+    operations = [
+    ]

hc/accounts/migrations/0010_merge_20180712_1640.py

@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10 on 2018-07-12 16:40
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('accounts', '0009_merge_20180711_1206'),
+        ('accounts', '0009_merge_20180704_1359'),
+    ]
+
+    operations = [
+    ]

hc/accounts/migrations/0011_merge_20180716_1253.py

@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10 on 2018-07-16 12:53
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('accounts', '0010_merge_20180714_0612'),
+        ('accounts', '0010_merge_20180712_1640'),
+    ]
+
+    operations = [
+    ]

hc/accounts/migrations/0012_auto_20180717_0704.py

@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10 on 2018-07-17 07:04
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('accounts', '0011_merge_20180716_1253'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='profile',
+            name='report_frequency',
+            field=models.CharField(default='month', max_length=20),
+        ),
+    ]

hc/accounts/tests/test_profile.py

@@ -3,7 +3,7 @@
 
 from hc.test import BaseTestCase
 from hc.accounts.models import Member
-from hc.api.models import Check
+from hc.api.models import Check, Assigned
 
 
 class ProfileTestCase(BaseTestCase):
@@ -203,3 +203,76 @@ def test_it_loads_reports(self):
         self.client.login(username="[email protected]", password="password")
         response = self.client.get(reverse("hc-reports"))
         self.assertIn(b"Today's Report", response.content)
+
+    def test_it_assigns_check_to_member(self):
+        """test that a team member can be removed"""
+        self.check = Check(user=self.alice)
+        self.check.save()
+        self.client.login(username="[email protected]", password="password")
+        assigned_list = []
+        assigned_list.append(self.check.code)
+        form = {"assign_checks": "1", "email": "[email protected]",
+                "check_code": self.check.code,
+                "priority": 3, "assigned_list": assigned_list}
+        r = self.client.post("/accounts/profile/", form)
+        assert r.status_code == 200
+
+        self.assertEqual(Assigned.objects.count(), 1)
+        assigned = Assigned.objects.filter(check_assigned=self.check).first()
+        self.assertEqual(assigned.priority, 3)
+
+    def test_it_assigns_2_checks_to_one_member(self):
+        """test that a team member can be removed"""
+        self.check = Check(user=self.alice)
+        self.check.save()
+        self.check2 = Check(user=self.alice)
+        self.check2.save()
+        self.client.login(username="[email protected]", password="password")
+        assigned_list = []
+        assigned_list.append(self.check.code)
+        assigned_list.append(self.check2.code)
+        form = {"assign_checks": "1", "email": "[email protected]",
+                "check_code": self.check.code,
+                "priority": "3", "assigned_list": assigned_list}
+        response = self.client.post("/accounts/profile/", form)
+        assert response.status_code == 200
+
+        self.assertEqual(Assigned.objects.count(), 2)
+
+    def test_it_unassign_check_from_members(self):
+        """test that a team member can be removed"""
+        self.check = Check(user=self.alice)
+        self.check.save()
+        self.client.login(username="[email protected]", password="password")
+        assigned_list = []
+        assigned_list.append(self.check.code)
+        form = {"assign_checks": "1", "email": "[email protected]",
+                "check_code": self.check.code,
+                "priority": 3, "assigned_list": assigned_list}
+        self.client.post("/accounts/profile/", form)
+        self.assertEqual(Assigned.objects.count(), 1)
+        assigned_empty = []
+        form = {"assign_checks": "1", "email": "[email protected]",
+                "check_code": self.check.code,
+                "assigned_list": assigned_empty}
+        self.client.post("/accounts/profile/", form)
+        self.assertEqual(Assigned.objects.count(), 0)
+
+    def test_it_doesnt_assign_check_to_same_user_twice(self):
+        """test that a team member can be removed"""
+        self.check = Check(user=self.alice)
+        self.check.save()
+        self.client.login(username="[email protected]", password="password")
+        assigned_list = []
+        assigned_list.append(self.check.code)
+        form = {"assign_checks": "1", "email": "[email protected]",
+                "check_code": self.check.code,
+                "priority": 3, "assigned_list": assigned_list}
+        self.client.post("/accounts/profile/", form)
+        self.assertEqual(Assigned.objects.count(), 1)
+
+        form = {"unassign_check": "1", "email": "[email protected]",
+                "check_code": self.check.code,
+                "assigned_list": assigned_list}
+        self.client.post("/accounts/profile/", form)
+        self.assertEqual(Assigned.objects.count(), 1)

hc/accounts/views.py

@@ -11,11 +11,14 @@
 from django.core import signing
 from django.http import HttpResponseForbidden, HttpResponseBadRequest
 from django.shortcuts import redirect, render
-from hc.accounts.forms import (EmailPasswordForm, InviteTeamMemberForm,
-                               RemoveTeamMemberForm, ReportSettingsForm,
-                               SetPasswordForm, TeamNameForm)
+from hc.accounts.forms import (EmailPasswordForm,
+                               InviteTeamMemberForm,
+                               RemoveTeamMemberForm,
+                               ReportSettingsForm,
+                               SetPasswordForm,
+                               TeamNameForm)
 from hc.accounts.models import Profile, Member
-from hc.api.models import Channel, Check
+from hc.api.models import Channel, Check, Assigned
 from hc.lib.badges import get_badge_url
 
 
@@ -155,7 +158,6 @@ def profile(request):
         elif "show_api_key" in request.POST:
             show_api_key = True
         elif "update_reports_allowed" in request.POST:
-            # print(request.POST)
             form = ReportSettingsForm(request.POST)
             if form.is_valid():
                 profile.reports_allowed = form.cleaned_data["reports_allowed"]
@@ -191,6 +193,30 @@ def profile(request):
                                       user=farewell_user).delete()
 
                 messages.info(request, "%s removed from team!" % email)
+        elif "assign_checks" in request.POST:
+            email_show = request.POST.get('email')
+            assigned_show = request.POST.getlist('assigned_list')
+            priority = request.POST.get('priority')
+            user = User.objects.filter(email=email_show).first()
+            delete_list = Assigned.objects.filter(user_id=user.id)
+            for value in delete_list:
+                if str(value.check_assigned.code) not in assigned_show:
+                    assigned_check = Check.objects.filter(
+                        code=value.check_assigned.code).first()
+                    Assigned.objects.filter(check_assigned=assigned_check,
+                                            user_id=user.id).delete()
+            for check_code in assigned_show:
+                user = User.objects.filter(email=email_show).first()
+                assigned_check = Check.objects.filter(code=check_code).first()
+                minus_list = Assigned.objects.filter(
+                    check_assigned=assigned_check, user_id=user.id)
+                if len(list(minus_list)) == 0:
+                    assign = Assigned(
+                        check_assigned=assigned_check,
+                        priority=priority, user_id=user.id)
+                    assign.save()
+                    messages.success(request,
+                                     "Team member has been assigned to check")
         elif "set_team_name" in request.POST:
             if not profile.team_access_allowed:
                 return HttpResponseForbidden()
@@ -212,12 +238,27 @@ def profile(request):
             continue
 
         badge_urls.append(get_badge_url(username, tag))
-
+    checks = Check.objects.filter(user=request.team.user)
+    assigned = Assigned.objects.all()
+    assigned_list = []
+
+    for member in profile.member_set.all():
+        for check in checks:
+            is_assigned = Assigned.objects.filter(check_assigned=check,
+                                                  user_id=member.user.id).\
+                                                  first()
+            if is_assigned:
+                assigned_list.append(1)
+            else:
+                assigned_list.append(0)
     ctx = {
         "page": "profile",
         "badge_urls": badge_urls,
         "profile": profile,
-        "show_api_key": show_api_key
+        "show_api_key": show_api_key,
+        "checks": checks,
+        "assigned": assigned,
+        "assigned_list":  assigned_list
     }
 
     return render(request, "accounts/profile.html", ctx)

hc/api/management/commands/sendalerts.py

@@ -2,7 +2,6 @@
 import time
 from concurrent.futures import ThreadPoolExecutor
 from django.core.management.base import BaseCommand
-from django.db.models import Q
 from django.db import connection
 from django.utils import timezone
 from hc.api.models import Check
@@ -19,10 +18,12 @@ def handle_many(self):
 
         query = Check.objects.filter(user__isnull=False).select_related("user")
 
-        running_checks = running_checks = query.filter(
-            Q(status="up") | Q(status="down"))
+        # running_checks = running_checks = query.filter(
+        #     Q(status="up") | Q(status="down"))
 
         now = timezone.now()
+        going_down = query.filter(alert_after__lt=now, status="up")
+        going_up = query.filter(alert_after__gt=now, status="down")
         repeat_list_approved = query.filter(
             alert_after__lt=now,
             status="down",
@@ -47,12 +48,11 @@ def handle_many(self):
 
         if repeat_list_approved:
             checks = (
-                list(
-                    running_checks.iterator()) +
+                list(going_down.iterator()) + list(going_up.iterator()) +
                 list(repeat_list_approved))
         else:
             checks = (
-                list(running_checks.iterator()) +
+                list(going_down.iterator()) + list(going_up.iterator()) +
                 list(repeat_list_approved.iterator()))
 
         if not checks:

hc/api/migrations/0035_auto_20180705_1350.py

@@ -0,0 +1,35 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10 on 2018-07-05 13:50
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('api', '0034_auto_20180703_1212'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='check',
+            name='shopify',
+            field=models.BooleanField(default=False),
+        ),
+        migrations.AddField(
+            model_name='check',
+            name='shopify_api_key',
+            field=models.CharField(blank=True, max_length=500),
+        ),
+        migrations.AddField(
+            model_name='check',
+            name='shopify_name',
+            field=models.CharField(blank=True, max_length=500),
+        ),
+        migrations.AddField(
+            model_name='check',
+            name='shopify_password',
+            field=models.CharField(blank=True, max_length=500),
+        ),
+    ]

hc/api/migrations/0036_merge_20180711_1206.py

@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10 on 2018-07-11 12:06
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('api', '0035_auto_20180703_0928'),
+        ('api', '0035_auto_20180705_1350'),
+    ]
+
+    operations = [
+    ]

hc/api/migrations/0051_merge_20180716_1254.py

@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10 on 2018-07-16 12:54
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('api', '0036_merge_20180711_1206'),
+        ('api', '0050_merge_20180716_0922'),
+    ]
+
+    operations = [
+    ]

hc/api/migrations/0052_auto_20180717_0704.py

@@ -0,0 +1,21 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10 on 2018-07-17 07:04
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('api', '0051_merge_20180716_1254'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='check',
+            name='twilio_number',
+            field=models.TextField(blank=True,
+                                   default='+00000000000', null=True),
+        ),
+    ]