Changeset 5680065

Timestamp:

Mar 29, 2012, 12:53:54 AM (14 years ago)

Author:

Alex Dehnert <adehnert@…>

Branches:

master, space-access, stable, stage

Children:

a53f8ee

Parents:

94f3a39

git-author:

Alex Dehnert <adehnert@…> (03/29/12 00:53:54)

git-committer:

Alex Dehnert <adehnert@…> (03/29/12 00:53:54)

Message:

Make locker updates work

I *think* this whole nasty pile of code may *finally* do what it's supposed to.

Fixes ASA Trac #15 and #7, maybe?

Location:

asadb

Files:

• space/admin.py (modified) (1 diff)
• space/diffs.py (modified) (8 diffs)
• space/import_into_db.py (modified) (1 diff)
• space/migrations/0001_initial.py (added)
• space/migrations/__init__.py (added)
• space/models.py (modified) (3 diffs)
• template/space/cac-change-email.txt (modified) (1 diff)
• template/space/group-change-email.txt (modified) (1 diff)

asadb/space/admin.py

@@ -8 +8 @@
         'number',
         'asa_owned',
+        'merged_acl',
     )
     list_display_links = ( 'id', 'number', )

asadb/space/diffs.py

@@ -23 +23 @@
 
 role = {
-    'office': groups.models.OfficerRole.objects.get(slug='office-access')
+    'office': groups.models.OfficerRole.objects.get(slug='office-access'),
+    'locker': groups.models.OfficerRole.objects.get(slug='locker-access'),
 }
 
@@ -60 +61 @@
         self.group = group
         self.offices = {}  # Space.pk -> (ID -> (Set name, Set name))
-        if not role:
-            role['office'] = groups.models.OfficerRole.objects.get(slug='office-access')
-
-    def learn_access(self, space_pk, old, new):
+        self.locker_acl = {}
+        self.locker_messages = []
+        self.changes = False
+
+    def learn_office_access(self, space_pk, old, new):
         group_pk = self.group.pk
         if group_pk in old:
@@ -97 +99 @@
         self.add_office_signatories_per_time(1, new_time)
 
-    def list_changes(self, ):
+    def list_office_changes(self, ):
         cac_lines = []
         group_lines = []
@@ -103 +105 @@
             cac_lines.append("%s:\t%s:\t%s" % (mit_id, verb, name))
             group_lines.append("%s:\t%s" % (verb, name))
-        changes = False
         for space_pk, space_data in self.offices.items():
             line = "Changes in %s:" % (all_spaces[space_pk].number, )
@@ -113 +114 @@
                     pass
                 else:
-                    changes = True
+                    self.changes = True
                     for name in old_names:
                         if name in new_names:
@@ -129 +130 @@
         cac_msg = "\n".join(cac_lines)
         group_msg = "\n".join(group_lines)
-        return changes, cac_msg, group_msg
+        return cac_msg, group_msg
+
+    def add_locker_signatories(self, space_access, time):
+        # space_access: ID -> (Name -> (Set Group.pk))
+        if time in self.locker_acl:
+            locker_acl = self.locker_acl[time]
+        else:
+            locker_acl = self.group.officers(as_of=time, role=role['locker'])
+            self.locker_acl[time] = locker_acl
+        for holder in locker_acl:
+            fill_people(holder)
+            holder_name = people_name[holder.person]
+            holder_id = people_id[holder.person]
+            space_access[holder_id][holder_name].add(self.group.pk)
 
 def init_groups(the_groups, assignments):
@@ -137 +151 @@
             the_groups[group.id] = GroupInfo(group)
 
-def space_specific_access(group_data, old_time, new_time, ):
-    process_spaces =  space.models.Space.objects.all()
-    #process_spaces = process_spaces.filter(number="W20-467")
-    for the_space in process_spaces:
-        old_data = the_space.build_access(time=old_time)
-        new_data = the_space.build_access(time=new_time)
-        all_spaces[the_space.pk] = the_space
-        init_groups(group_data, old_data[2])
-        init_groups(group_data, new_data[2])
-        for group_pk, group in group_data.items():
-            if group_pk in old_data[0] or group_pk in new_data[0]:
-                group.learn_access(the_space.pk, old_data[0], new_data[0])
-
+def flip_dict(dct):
+    new = collections.defaultdict(set)
+    for key, vals in dct.items():
+        for val in vals:
+            new[val].add(key)
+    return new
+
+def joint_keys(dct1, dct2):
+    return set(dct1.keys()).union(dct2.keys())
+
+class LockerAccessChangeEntry(object):
+    def __init__(self, mit_id, verb, name, groups):
+        self.mit_id = mit_id
+        self.verb = verb
+        self.name = name
+        self.cac_msgs = ""
+        self.group_msgs = ""
+        self.groups = groups
+
+    def cac_format(self):
+        return "%s\t%s\t%s\t%s" % (self.mit_id, self.verb, self.name, self.cac_msgs)
+
+    def group_format(self):
+        return "%s\t%s\t%s" % (self.verb, self.name, self.group_msgs)
+
+def safe_add_change_real(change_by_name, change):
+    name = change.name
+    if name in change_by_name:
+        if change_by_name[name].verb != change.verb or change_by_name[name].groups != change.groups:
+            print "change_by_name=%s" % (change_by_name, )
+            print "change: old=%s; new=%s" % (change_by_name[name], change)
+            assert False
+    else:
+        change_by_name[name] = change
+
+def locker_access_diff(the_space, group_data, old_access, new_access, ):
+    cac_msgs = [] # [String]
+    for mit_id in joint_keys(old_access, new_access):
+        change_by_name = {} # name -> LockerAccessChangeEntry
+        def safe_add(change):
+            safe_add_change_real(change_by_name, change)
+        old_by_names = old_access[mit_id]
+        new_by_names = new_access[mit_id]
+        old_by_group = flip_dict(old_by_names)
+        new_by_group = flip_dict(new_by_names)
+        unchanged = (old_by_names == new_by_names)
+        if unchanged: continue
+        print "ID=%s (%s):\n\t%s\t(%s)\n\t%s\t(%s)\n" % (mit_id, unchanged, old_by_names, old_by_group, new_by_names, new_by_group, ),
+        for group_pk in joint_keys(old_by_group, new_by_group):
+            old_names = old_by_group[group_pk]
+            new_names = new_by_group[group_pk]
+            for name in old_names.union(new_names):
+                changed_groups = old_by_names[name] ^ new_by_names[name]
+
+                def mkchange(verb):
+                    change = LockerAccessChangeEntry(
+                        mit_id=mit_id,
+                        verb=verb,
+                        name=name,
+                        groups=changed_groups,
+                    )
+                    if verb == "Keep":
+                        change.group_msgs = "(other groups involved)"
+                    change.cac_msgs = "(groups: %s -> %s)" % (old_by_names[name], new_by_names[name])
+                    return change
+
+                if name in old_names and name in new_names: # keep
+                    safe_add(mkchange("Keep"))
+                elif name in old_names: # remove from this group
+                    if new_by_names[name]: # keep b/c other groups
+                        safe_add(mkchange("Keep"))
+                    else:
+                        safe_add(mkchange("Remove"))
+                elif name in new_names: # add for this group
+                    if old_by_names[name]: # keep b/c other groups
+                        safe_add(mkchange("Keep"))
+                    else:
+                        safe_add(mkchange("Add"))
+                else:
+                    assert False, "in old_names or new_names, but not in both, one, or the other..."
+
+        # Handle reporting the results...
+        for change in change_by_name.values():
+            cac_msgs.append(change.cac_format())
+            group_msg = "%s\t%s" % (the_space.number, change.group_format())
+            for group_pk in change.groups:
+                group_data[group_pk].locker_messages.append(group_msg)
+                group_data[group_pk].changes = True
+
+    return cac_msgs
+
+def space_specific_access(the_space, group_data, old_time, new_time, ):
+    old_data = the_space.build_access(time=old_time)
+    new_data = the_space.build_access(time=new_time)
+    all_spaces[the_space.pk] = the_space
+    init_groups(group_data, old_data[2])
+    init_groups(group_data, new_data[2])
+    for group_pk, group_info in group_data.items():
+        if group_pk in old_data[0] or group_pk in new_data[0]:
+            if the_space.merged_acl:
+                group_info.add_locker_signatories(old_data[1], old_time)
+                group_info.add_locker_signatories(new_data[1], new_time)
+            else:
+                group_info.learn_office_access(the_space.pk, old_data[0], new_data[0])
+    cac_msgs = []
+    if the_space.merged_acl:
+        cac_msgs = locker_access_diff(the_space, group_data, old_data[1], new_data[1])
+    return cac_msgs
 
 def space_access_diffs():
@@ -156 +265 @@
     bulk_fill_people([old_time, new_time])
     group_data = {} # Group.pk -> GroupInfo
+    cac_locker_msgs = []
+
+    process_spaces =  space.models.Space.objects.all()
+    for the_space in process_spaces:
+        new_cac_msgs = space_specific_access(the_space, group_data, old_time, new_time)
+        if new_cac_msgs:
+            cac_locker_msgs.append("%s\n%s\n" % (the_space.number, "\n".join(new_cac_msgs)))
+
     changed_groups = []
-    space_specific_access(group_data, old_time, new_time)
     for group_pk, group_info in group_data.items():
         group_info.add_office_signatories(old_time, new_time)
-        changes, cac_changes, group_changes = group_info.list_changes()
-        if changes:
-            changed_groups.append((group_info.group, cac_changes, group_changes))
+        cac_changes, group_office_changes = group_info.list_office_changes()
+        if group_info.changes:
+            changed_groups.append((group_info.group, cac_changes, group_office_changes, group_info.locker_messages, ))
 
     asa_rcpts = ['asa-space@mit.edu', 'asa-db@mit.edu', ]
     util.emails.email_from_template(
         tmpl='space/cac-change-email.txt',
-        context={'changed_groups': changed_groups},
-        subject="Office access updates",
+        context={'changed_groups': changed_groups, 'locker_msgs':cac_locker_msgs, },
+        subject="Space access updates",
         to=['caclocks@mit.edu'],
         cc=asa_rcpts,
     ).send()
-    for group, cac_msg, group_msg in changed_groups:
+    for group, cac_msg, group_office_msg, group_locker_msgs in changed_groups:
         util.emails.email_from_template(
             tmpl='space/group-change-email.txt',
             context={
                 'group':group,
-                'msg':group_msg,
+                'office_msg':group_office_msg,
+                'locker_msgs':group_locker_msgs,
             },
-            subject="Office access updates",
+            subject="[ASA DB] Space access updates",
             to=[group.officer_email],
             cc=asa_rcpts,
         ).send()
-        
+
 
 if __name__ == "__main__":

asadb/space/import_into_db.py

@@ -22 +22 @@
         print "Ignoring missing group: %s: %s" % (line['group'], line, )
         return
-    the_space, created = space.models.Space.objects.get_or_create(number=line['office_number'])
+    the_space, created = space.models.Space.objects.get_or_create(
+        number=line['office_number'],
+        defaults=dict(merged_acl=bool(line['locker_number'])),
+    )
     group = groups.models.Group.objects.get(id=group_id)
     try:

asadb/space/models.py

@@ -14 +14 @@
     number = models.CharField(max_length=20, unique=True, )
     asa_owned = models.BooleanField(default=True, )
+    merged_acl = models.BooleanField(default=False, help_text="Does this room have a single merged ACL, that combines all groups together, or CAC maintain a separate ACL per-group? Generally, the shared storage offices get a merged ACL and everything else doesn't.")
     notes = models.TextField(blank=True, )
 
@@ -70 +71 @@
             aces = aces.filter(group=group)
         access = {}    # Group.pk -> (ID -> Set name)
-        access_by_id = {} # ID -> (Name -> (Set Group.pk))
+        # ID -> (Name -> (Set Group.pk))
+        access_by_id = collections.defaultdict(lambda: collections.defaultdict(set))
         for assignment in assignments:
             if assignment.group.pk not in access:
@@ -77 +79 @@
             if ace.group.pk in access:
                 access[ace.group.pk][ace.card_number].add(ace.name)
-                if ace.card_number not in access_by_id:
-                    access_by_id[ace.card_number] = collections.defaultdict(set)
                 access_by_id[ace.card_number][ace.name].add(ace.group.pk)
             else:

asadb/template/space/cac-change-email.txt

@@ -6 +6 @@
 ASA Exec
 
-{% for group, cac_changes, group_changes in changed_groups %}
+{% if locker_msgs %}Locker room access:
+{% for msg in locker_msgs %}
+{{msg}}
+{% endfor %}
+{% endif %}
+
+
+{% for group, cac_changes, group_office_changes, group_locker_changes in changed_groups %}
 Group: {{group.name}} (ID#{{group.pk}})
 Officer email: {{group.officer_email}}
 
-{{cac_changes}}
+{% if cac_changes %}{{cac_changes}}
 
-
-{% endfor %}{% endautoescape %}
+{% endif %}
+{% endfor %}
+{% endautoescape %}

asadb/template/space/group-change-email.txt

@@ -1 +1 @@
 {% autoescape off %}
 Hi {{group.name}},
-    Thank you for updating office access on the ASA database today. We've forwarded the following changes on to CAC:
+    Thank you for updating space access on the ASA database today. We've forwarded the following changes on to CAC:
 
-{{msg}}
+{% if office_msg %}
+Office access:
+
+{{office_msg}}
+{% endif %}{% if locker_msgs %}
+Locker (shared storage) access:
+{% for msg in locker_msgs %}
+{{msg}}{% endfor %}
+{% endif %}
+
+If you believe these changes are incorrect in any way, please let us know --- beyond just notifying CAC, we also want to find out why the errors happened.
 
 Thanks,