Changeset 94f3a39

Timestamp:

Mar 28, 2012, 6:16:55 AM (14 years ago)

Author:

Alex Dehnert <adehnert@…>

Branches:

master, space-access, stable, stage

Children:

5680065

Parents:

96ef09f

git-author:

Alex Dehnert <adehnert@…> (03/28/12 06:14:59)

git-committer:

Alex Dehnert <adehnert@…> (03/28/12 06:16:55)

Message:

Come closer to handling shared storage

Location:

asadb/space

Files:

• diffs.py (modified) (1 diff)
• models.py (modified) (3 diffs)

asadb/space/diffs.py

@@ -144 +144 @@
         new_data = the_space.build_access(time=new_time)
         all_spaces[the_space.pk] = the_space
-        init_groups(group_data, old_data[1])
-        init_groups(group_data, new_data[1])
+        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]:

asadb/space/models.py

@@ -42 +42 @@
                 Usually, the sets will each have one member, but ID 999999999 is decently likely to have several.
                 The SpaceAccessListEntrys will be filtered to reflect assignments as of that time.
+            access_by_id:
+                ID -> (Name -> (Set Group.pk))
+                Indicates who has access. Grouped by ID number and name.
+                Usually, each ID dict will have one member, but ID 999999999 is, again, likely to have several.
+                This is intended for rooms that have one access list (e.g., W20-437 and W20-441)
             assignments:
                 [SpaceAssignment]
@@ -65 +70 @@
             aces = aces.filter(group=group)
         access = {}    # Group.pk -> (ID -> Set name)
+        access_by_id = {} # ID -> (Name -> (Set Group.pk))
         for assignment in assignments:
             if assignment.group.pk not in access:
@@ -71 +77 @@
             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:
                 # This group appears to no longer have access...
                 errors.append("Group %s no longer has access to %s, but has live ACEs." % (ace.group, self, ))
-        return access, assignments, aces, errors
+        return access, access_by_id, assignments, aces, errors
 
 reversion.register(Space)