Changeset 00079cf

Timestamp:

Feb 26, 2012, 3:55:58 AM (14 years ago)

Author:

Alex Dehnert <adehnert@…>

Branches:

master, space-access, stable, stage

Children:

99747bd

Parents:

41f8b1e

git-author:

Alex Dehnert <adehnert@…> (02/26/12 03:55:58)

git-committer:

Alex Dehnert <adehnert@…> (02/26/12 03:55:58)

Message:

Stuff with group admins

• Create a new group-admin role, which can manage a group's database entry (Trac: #78)
• Script to import old signatories on a temporary basis, and only for groups that haven't really updated their group entry

Location:

asadb/groups

Files:

• import_signatories.py (modified) (6 diffs)
• migrations/0023_groupadmin.py (added)

asadb/groups/import_signatories.py

@@ -74 +74 @@
 
 @transaction.commit_on_success
-def perform_sync(stats, dj_map, wh_map, ):
+def perform_sync(stats, dj_map, wh_map, roles=None, dj_groups=None, ):
     # Statistics
     stats['loops'] = 0
@@ -83 +83 @@
     stats['added'] = 0
     stats['missing_rg'] = 0
+    stats['missing_role'] = 0
 
     today = datetime.date.today()
-    roles = load_roles()
-    dj_groups = load_groups()
+    if roles is None:
+        roles = load_roles()
+    if dj_groups is None:
+        dj_groups = load_groups()
     for key in set(dj_map.keys()).union(wh_map.keys()):
         stats['loops'] += 1
@@ -130 +133 @@
                         stats['added'] += 1
                     else:
-                        print "Missing role or group: person=%s, role=%s, group=%d, start=%s, expiry=%s" % (
-                            person, role_slug, group_id, start, expiry,
-                        )
-                        stats['missing_rg'] += 1
+                        if role_slug not in roles:
+                            stats['missing_role'] += 1
+                        else:
+                            print "Missing role or group: person=%s, role=%s, group=%d, start=%s, expiry=%s" % (
+                                person, role_slug, group_id, start, expiry,
+                            )
+                            stats['missing_rg'] += 1
+
 
 if __name__ == '__main__':
-    stats = {}
+    stats = {
+        'group_ign': 0,
+    }
+
+    mode = 'all'
+    roles = None # default
+    if len(sys.argv) > 1:
+        if sys.argv[1] == 'squash':
+            mode = 'squash'
+        elif sys.argv[1] == 'all':
+            pass
+        else:
+            raise NotImplementedError
+    if mode == 'squash':
+        roles = load_roles()
+        repl = roles['temp-admin']
+        for slug, role in roles.items():
+            if slug in ('president', 'treasurer', 'financial', ):
+                roles[slug] = repl
+            else:
+                del roles[slug]
 
     print "Phase 1: %s: Loading Django officer information" % (datetime.datetime.now(), )
@@ -142 +169 @@
     print "Phase 1: %s: Complete: Loading Django officer information" % (datetime.datetime.now(), )
 
-    print "Phase 2: %s: Loading warehouse officer information" % (datetime.datetime.now(), )
+    print "Phase 2: %s: Loading Django group information" % (datetime.datetime.now(), )
+    dj_groups = load_groups()
+    if mode == 'squash':
+        for pk, group in dj_groups.items():
+            if len(group.officers()) > 1:
+                stats['group_ign'] += 1
+                del dj_groups[pk]
+            else:
+                print "Keeping ", group
+    print "Phase 2: %s: Complete: Loading Django group information" % (datetime.datetime.now(), )
+
+    print "Phase 3: %s: Loading warehouse officer information" % (datetime.datetime.now(), )
     wh_map = load_warehouse(stats)
-    print "Phase 2: %s: Complete: Loading warehouse officer information" % (datetime.datetime.now(), )
-
-    print "Phase 3: %s: Performing sync" % (datetime.datetime.now(), )
-    perform_sync(stats, dj_map, wh_map, )
-    print "Phase 3: %s: Complete: Performing sync" % (datetime.datetime.now(), )
+    print "Phase 3: %s: Complete: Loading warehouse officer information" % (datetime.datetime.now(), )
+
+    print "Phase 4: %s: Performing sync" % (datetime.datetime.now(), )
+    perform_sync(stats, dj_map, wh_map, roles, dj_groups, )
+    print "Phase 4: %s: Complete: Performing sync" % (datetime.datetime.now(), )
 
     print """
@@ -155 +193 @@
     Django current:         %(dj_total_current)6d
     Django distinct:        %(dj_distinct_current)6d
+    Django ignored groups:  %(group_ign)6d
 
     Warehouse p/r/g tuples: %(wh_size)6d
@@ -164 +203 @@
     People expired:         %(expired)6d
     People missing from WH: %(missing_wh)6d
+    People in missing group:%(missing_rg)6d
+    People for missing role:%(missing_role)6d
     People added:           %(added)6d
     """ % stats