Changeset 161ce5f for asadb

Timestamp:

Dec 24, 2012, 2:30:45 AM (13 years ago)

Author:

Alex Dehnert <adehnert@…>

Branches:

master, space-access, stable, stage

Children:

0290330

Parents:

6559695

git-author:

Alex Dehnert <adehnert@…> (12/24/12 02:30:45)

git-committer:

Alex Dehnert <adehnert@…> (12/24/12 02:30:45)

Message:

Describe changes made by load_people (ASA-#192)

groups/load_people.py outputs a summary of the changes it made --- the numbers
of people processed, the usernames imported, etc.. However, it doesn't describe
what *specific* changes occurred --- what fields were updated, what account
class new users are in, etc.. This adds that data. In particular, showing the
account classes of freshly created and destroyed users will probably help to
notice any weird bursts of activity.

File:

• asadb/groups/load_people.py (modified) (4 diffs)

asadb/groups/load_people.py

@@ -62 +62 @@
             # great, they're still in the dump
             changed = False
+            changes = []
             dcm_person = dcm_people[django_person.username]
             del dcm_people[django_person.username]
+
+            # Check for changes: first fields, then deletions
             for key in fields:
                 if django_person.__dict__[key] != dcm_person[key]:
                     changed = True
+                    if key == 'mit_id':
+                        changes.append((key, '[redacted]', '[redacted]', ))
+                    else:
+                        changes.append((key, django_person.__dict__[key], dcm_person[key]))
                     if mutable:
                         django_person.__dict__[key] = dcm_person[key]
@@ -74 +81 @@
                     django_person.del_date = None
                     stat_undel += 1
-                    stat_people['undel'].append(django_person.username)
+                    changes.append(('[account]', '[deleted]', '[undeleted]', ))
+                    stat_people['undel'].append((django_person.username, changes))
+
             if changed:
+                stat_name = ''
                 if mutable:
                     django_person.mod_date = datetime.date.today()
                     django_person.save()
                     stat_changed += 1
-                    stat_people['changed'].append(django_person.username)
+                    stat_name = 'changed'
                 else:
                     stat_mut_ign += 1
-                    stat_people['mut_ign'].append(django_person.username)
+                    stat_name = 'mut_ign'
+                stat_people[stat_name].append((django_person.username, changes))
             else:
                 stat_unchanged += 1
+
         else:
+            # They're not in the dump
             if django_person.del_date is None:
+                stat_name = ''
                 if mutable:
                     django_person.del_date = datetime.date.today()
                     stat_del += 1
-                    stat_people['del'].append(django_person.username)
+                    stat_name = 'del'
                     django_person.save()
                 else:
                     stat_mut_ign += 1
-                    stat_people['mut_ign'].append(django_person.username)
+                    stat_name = 'mut_ign'
+                changes = [('account_class', django_person.account_class, '[deleted]')]
+                stat_people[stat_name].append((django_person.username, changes))
             else:
                 stat_pre_del += 1
+
+    transaction.commit()
+
+    # Import new people from the DCM
     for username, dcm_person in dcm_people.items():
         stat_loops += 1
@@ -108 +128 @@
         django_person.add_date = datetime.date.today()
         stat_add += 1
-        stat_people['add'].append(django_person.username)
+        changes = [('account_class', '[missing]', dcm_person['account_class'], )]
+        stat_people['add'].append((django_person.username, changes))
         django_person.save()
     transaction.commit()
+
     stats = {
         'loops': stat_loops,
@@ -147 +169 @@
 
     for change_type, people in stat_people.items():
-        for person in people:
-            print "%12s\t%s" % (change_type, person, )
+        for person, changes in people:
+            print "%12s\t%12s\t%s" % (change_type, person, changes, )
         print ""