Fixed bug in 'gam report users ... aggregatebydate|aggregatebyuser`

Author: taers232c

src/GamUpdate.txt

@@ -1,3 +1,7 @@
+7.28.07
+
+Fixed bug in 'gam report users ... aggregatebydate|aggregatebyuser` where `accounts:used_quota_in_percentage` was incorrectly displayed.
+
 7.28.06
 
 Updated `gam <UserTypeEntity> info|print|show calendars` and

src/gam/__init__.py

@@ -25,7 +25,7 @@
 """
 
 __author__ = 'GAM Team <[email protected]>'
-__version__ = '7.28.06'
+__version__ = '7.28.07'
 __license__ = 'Apache License 2.0 (http://www.apache.org/licenses/LICENSE-2.0)'
 
 #pylint: disable=wrong-import-position
@@ -13999,6 +13999,12 @@ def processCustomerUsage(usage, lastDate):
         csvPF.WriteRow(row)
     return (True, lastDate)
 
+  def _computeUsedQuotaInPercentage(events):
+    if ('accounts:total_quota_in_mb' in events) and ('accounts:used_quota_in_mb' in events):
+      events['accounts:used_quota_in_percentage'] = int(events['accounts:used_quota_in_mb']/events['accounts:total_quota_in_mb']*100)
+    else:
+      events['accounts:used_quota_in_percentage'] = 0
+
   # dynamically extend our choices with other reports Google dynamically adds
   rep = buildGAPIObject(API.REPORTS)
   dyn_choices = rep._rootDesc \
@@ -14296,6 +14302,8 @@ def processCustomerUsage(usage, lastDate):
         row = {'date': usageDate}
         if addCSVData:
           row.update(addCSVData)
+        if 'accounts:used_quota_in_percentage' in events:
+          _computeUsedQuotaInPercentage(events)
         for event, count in events.items():
           if convertMbToGb and event.endswith('_in_gb'):
             count = f'{count/1024:.2f}'
@@ -14310,6 +14318,8 @@ def processCustomerUsage(usage, lastDate):
           row['orgUnitPath'] = userOrgUnits.get(email, UNKNOWN)
         if addCSVData:
           row.update(addCSVData)
+        if 'accounts:used_quota_in_percentage' in events:
+          _computeUsedQuotaInPercentage(events)
         for event, count in events.items():
           if convertMbToGb and event.endswith('_in_gb'):
             count = f'{count/1024:.2f}'
@@ -17164,17 +17174,18 @@ def _setNamesFromIds(admin, privileges):
         admin['condition'] = 'securitygroup'
       elif admin['condition'] == NONSECURITY_GROUP_CONDITION:
         admin['condition'] = 'nonsecuritygroup'
-    if debug:
-      print('******', admin['assignedTo'], admin.get('assigneeType', 'no type'),
-            admin['assignedToField'], not typesSet or admin['assignedToField'] in typesSet)
+#    if debug:
+#      print('******', admin['assignedTo'], admin.get('assigneeType', 'no type'),
+#            admin['assignedToField'], not typesSet or admin['assignedToField'] in typesSet)
     return not typesSet or admin['assignedToField'] in typesSet
 
   cd = buildGAPIObject(API.DIRECTORY)
   sal = buildGAPIObject(API.SERVICEACCOUNTLOOKUP)
   csvPF = CSVPrintFile(PRINT_ADMIN_TITLES) if Act.csvFormat() else None
   roleId = None
   userKey = None
-  debug = oneItemPerRow = recursive = showPrivileges = False
+#  debug = False
+  oneItemPerRow = recursive = showPrivileges = False
   typesSet = set()
   kwargs = {}
   rolePrivileges = {}
@@ -17207,8 +17218,8 @@ def _setNamesFromIds(admin, privileges):
       showPrivileges = True
     elif myarg == 'oneitemperrow':
       oneItemPerRow = True
-    elif myarg == 'debug':
-      debug = True
+#    elif myarg == 'debug':
+#      debug = True
     else:
       unknownArgumentExit()
   if roleId and not kwargs: