Merged in [19103] from jennifer@painless-security.com:

    Add ConstraintNames for chair, tech, and key participant conflicts. Replace temporary UI workaround with proper conflict type handling. Fixes ietf-tools#3083.
 - Legacy-Id: 19123
Note: SVN reference [19103] has been migrated to Git commit 66b9c41

Author: rjsparks

ietf/meeting/management/commands/generate_schedule.py

@@ -583,7 +583,7 @@ def __init__(self, stdout, meeting, session_db, business_constraint_costs, verbo
         self.last_cost = None
 
         for constraint_db in constraints_db:
-            if constraint_db.name.slug in ['conflict', 'conflic2', 'conflic3']:
+            if constraint_db.name.is_group_conflict:
                 self.conflict_groups[constraint_db.target.acronym] += constraint_db.name.penalty
             elif constraint_db.name.slug == 'bethere':
                 self.conflict_people.add(constraint_db.person.pk)

ietf/meeting/migrations/0041_assign_correct_constraintnames.py

@@ -0,0 +1,47 @@
+# Generated by Django 2.2.20 on 2021-05-13 07:51
+
+from django.db import migrations
+
+
+replacement_slugs = (
+    ('conflict', 'chair_conflict'),
+    ('conflic2', 'tech_overlap'),
+    ('conflic3', 'key_participant'),
+)
+
+
+def affected(constraint_qs):
+    """Filter constraints, keeping only those to be updated"""
+    # The constraints were renamed in the UI in commit 16699 on 2019-09-03.
+    # This was between meetings 105 and 106. Assuming this migration and
+    # the new conflict types are in place before meeting 111, these
+    # are the meetings for which the UI disagreed with the constraint
+    # type actually created.
+    affected_meetings = ['106', '107', '108', '109', '110']
+    return constraint_qs.filter(meeting__number__in=affected_meetings)
+
+
+def forward(apps, schema_editor):
+    Constraint = apps.get_model('meeting', 'Constraint')
+    affected_constraints = affected(Constraint.objects.all())
+    for old, new in replacement_slugs:
+        affected_constraints.filter(name_id=old).update(name_id=new)
+
+
+def reverse(apps, schema_editor):
+    Constraint = apps.get_model('meeting', 'Constraint')
+    affected_constraints = affected(Constraint.objects.all())
+    for old, new in replacement_slugs:
+        affected_constraints.filter(name_id=new).update(name_id=old)
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('meeting', '0040_auto_20210130_1027'),
+        ('name', '0026_add_conflict_constraintnames'),
+    ]
+
+    operations = [
+        migrations.RunPython(forward, reverse),
+    ]

ietf/meeting/models.py

@@ -207,6 +207,26 @@ def get_number(self):
         else:
             return None
 
+    @property
+    def session_constraintnames(self):
+        """Gets a list of the constraint names that should be used for this meeting
+
+        Anticipated that this will soon become a many-to-many relationship with ConstraintName
+        (see issue #2770). Making this a @property allows use of the .all(), .filter(), etc,
+        so that other code should not need changes when this is replaced.
+        """
+        try:
+            mtg_num = int(self.number)
+        except ValueError:
+            mtg_num = None  # should not come up, but this method should not fail
+        if mtg_num is None or mtg_num >= 106:
+            # These meetings used the old 'conflic?' constraint types labeled as though
+            # they were the new types.
+            slugs = ('chair_conflict', 'tech_overlap', 'key_participant')
+        else:
+            slugs = ('conflict', 'conflic2', 'conflic3')
+        return ConstraintName.objects.filter(slug__in=slugs)
+
     def json_url(self):
         return "/meeting/%s/json" % (self.number, )
 

ietf/name/fixtures/names.json

@@ -5999,6 +5999,7 @@
     "fields": {
       "desc": "",
       "editor_label": "<i class=\"fa fa-user-o\"></i>{count}",
+      "is_group_conflict": false,
       "name": "Person must be present",
       "order": 4,
       "penalty": 10000,
@@ -6007,10 +6008,24 @@
     "model": "name.constraintname",
     "pk": "bethere"
   },
+  {
+    "fields": {
+      "desc": "Indicates other WGs the chairs also lead or will be active participants in",
+      "editor_label": "<i class=\"fa fa-gavel\"></i>",
+      "is_group_conflict": true,
+      "name": "Chair conflict",
+      "order": 8,
+      "penalty": 100000,
+      "used": true
+    },
+    "model": "name.constraintname",
+    "pk": "chair_conflict"
+  },
   {
     "fields": {
       "desc": "",
       "editor_label": "<span class=\"encircled\">2</span>",
+      "is_group_conflict": true,
       "name": "Conflicts with (secondary)",
       "order": 2,
       "penalty": 10000,
@@ -6023,6 +6038,7 @@
     "fields": {
       "desc": "",
       "editor_label": "<span class=\"encircled\">3</span>",
+      "is_group_conflict": true,
       "name": "Conflicts with (tertiary)",
       "order": 3,
       "penalty": 100000,
@@ -6035,6 +6051,7 @@
     "fields": {
       "desc": "",
       "editor_label": "<span class=\"encircled\">1</span>",
+      "is_group_conflict": true,
       "name": "Conflicts with",
       "order": 1,
       "penalty": 100000,
@@ -6043,10 +6060,37 @@
     "model": "name.constraintname",
     "pk": "conflict"
   },
+  {
+    "fields": {
+      "desc": "Indicates WGs with which key participants (presenter, secretary, etc.)  may overlap",
+      "editor_label": "<i class=\"fa fa-key\"></i>",
+      "is_group_conflict": true,
+      "name": "Key participant conflict",
+      "order": 10,
+      "penalty": 100000,
+      "used": true
+    },
+    "model": "name.constraintname",
+    "pk": "key_participant"
+  },
+  {
+    "fields": {
+      "desc": "Indicates WGs with a related technology or a closely related charter",
+      "editor_label": "<i class=\"fa fa-rocket\"></i>",
+      "is_group_conflict": true,
+      "name": "Technology overlap",
+      "order": 9,
+      "penalty": 10000,
+      "used": true
+    },
+    "model": "name.constraintname",
+    "pk": "tech_overlap"
+  },
   {
     "fields": {
       "desc": "",
       "editor_label": "&Delta;",
+      "is_group_conflict": false,
       "name": "Preference for time between sessions",
       "order": 6,
       "penalty": 1000,
@@ -6059,6 +6103,7 @@
     "fields": {
       "desc": "",
       "editor_label": "<i class=\"fa fa-calendar-o\"></i>",
+      "is_group_conflict": false,
       "name": "Can't meet within timerange",
       "order": 5,
       "penalty": 1000000,
@@ -6071,6 +6116,7 @@
     "fields": {
       "desc": "",
       "editor_label": "<i class=\"fa fa-step-forward\"></i>",
+      "is_group_conflict": false,
       "name": "Request for adjacent scheduling with another WG",
       "order": 7,
       "penalty": 1000,

ietf/name/migrations/0024_constraintname_is_group_conflict.py

@@ -0,0 +1,18 @@
+# Generated by Django 2.2.20 on 2021-05-19 09:45
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ('name', '0023_change_stream_descriptions'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='constraintname',
+            name='is_group_conflict',
+            field=models.BooleanField(default=False,
+                                      help_text='Does this constraint capture a conflict between groups?'),
+        ),
+    ]

ietf/name/migrations/0025_set_constraintname_is_group_conflict.py

@@ -0,0 +1,25 @@
+# Generated by Django 2.2.20 on 2021-05-19 09:55
+
+from django.db import migrations
+
+
+def forward(apps, schema_editor):
+    """Set is_group_conflict for ConstraintNames that need it to be True"""
+    ConstraintName = apps.get_model('name', 'ConstraintName')
+    ConstraintName.objects.filter(
+        slug__in=['conflict', 'conflic2', 'conflic3']
+    ).update(is_group_conflict=True)
+
+
+def reverse(apps, schema_editor):
+    pass  # nothing to be done
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ('name', '0024_constraintname_is_group_conflict'),
+    ]
+
+    operations = [
+        migrations.RunPython(forward, reverse),
+    ]

ietf/name/migrations/0026_add_conflict_constraintnames.py

@@ -0,0 +1,75 @@
+# Generated by Django 2.2.20 on 2021-05-05 10:05
+
+from collections import namedtuple
+from django.db import migrations
+from django.db.models import Max
+
+
+# Simple type for representing constraint name data that will be
+# modified.
+ConstraintInfo = namedtuple(
+    'ConstraintInfo',
+    ['replaces', 'slug', 'name', 'desc', 'editor_label'],
+)
+
+constraint_names_to_add = [
+    ConstraintInfo(
+        replaces='conflict',
+        slug='chair_conflict',
+        name='Chair conflict',
+        desc='Indicates other WGs the chairs also lead or will be active participants in',
+        editor_label='<i class="fa fa-gavel"></i>',
+    ),
+    ConstraintInfo(
+        replaces='conflic2',
+        slug='tech_overlap',
+        name='Technology overlap',
+        desc='Indicates WGs with a related technology or a closely related charter',
+        editor_label='<i class="fa fa-rocket"></i>',
+    ),
+    ConstraintInfo(
+        replaces='conflic3',
+        slug='key_participant',
+        name='Key participant conflict',
+        desc='Indicates WGs with which key participants (presenter, secretary, etc.)  may overlap',
+        editor_label='<i class="fa fa-key"></i>',
+    )
+]
+
+
+def forward(apps, schema_editor):
+    ConstraintName = apps.get_model('name', 'ConstraintName')
+    max_order = ConstraintName.objects.all().aggregate(Max('order'))['order__max']
+
+    for index, new_constraint in enumerate(constraint_names_to_add):
+        # hack_constraint is the constraint type relabeled by the hack fix in #2754
+        hack_constraint = ConstraintName.objects.get(slug=new_constraint.replaces)
+        ConstraintName.objects.create(
+            slug=new_constraint.slug,
+            name=new_constraint.name,
+            desc=new_constraint.desc,
+            used=hack_constraint.used,
+            order=max_order + index + 1,
+            penalty=hack_constraint.penalty,
+            editor_label=new_constraint.editor_label,
+            is_group_conflict=True,
+        )
+
+
+def reverse(apps, schema_editor):
+    ConstraintName = apps.get_model('name', 'ConstraintName')
+    for new_constraint in constraint_names_to_add:
+        ConstraintName.objects.filter(slug=new_constraint.slug).delete()
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ('name', '0025_set_constraintname_is_group_conflict'),
+        # Reversing this migration requires that the 'day' field be removed from
+        # the Constraint model, so we indirectly depend on the migration that
+        # removed it.
+        ('meeting', '0027_add_constraint_options_and_joint_groups'),
+    ]
+
+    operations = [
+        migrations.RunPython(forward, reverse),
+    ]

ietf/name/models.py

@@ -71,6 +71,7 @@ class ConstraintName(NameModel):
     """conflict, conflic2, conflic3, bethere, timerange, time_relation, wg_adjacent"""
     penalty = models.IntegerField(default=0, help_text="The penalty for violating this kind of constraint; for instance 10 (small penalty) or 10000 (large penalty)")
     editor_label = models.CharField(max_length=64, blank=True, help_text="Very short label for producing warnings inline in the sessions in the schedule editor.")
+    is_group_conflict = models.BooleanField(default=False, help_text="Does this constraint capture a conflict between groups?")
 class TimerangeName(NameModel):
     """(monday|tuesday|wednesday|thursday|friday)-(morning|afternoon-early|afternoon-late)"""
 class LiaisonStatementPurposeName(NameModel):