deepblue/GoogleDriveManagement
1
0
Fork 0
mirror of https://github.com/GAM-team/GAM.git synced 2026-07-04 12:51:36 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

fix for orgUnits, add travis test

Browse Source
This commit is contained in:
Jay Lee
2020-04-06 09:14:09 -04:00
parent 12ca54f6ba
commit 518ad04815
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.travis.yml
View File

@@ -208,8 +208,10 @@ script:
- if [ "$e2e" = true ]; then $gam print users query "travis.jid=$jid" | $gam csv - gam delete user ~primaryEmail; fi - if [ "$e2e" = true ]; then $gam print users query "travis.jid=$jid" | $gam csv - gam delete user ~primaryEmail; fi
- if [ "$e2e" = true ]; then $gam print mobile; fi - if [ "$e2e" = true ]; then $gam print mobile; fi
- if [ "$e2e" = true ]; then $gam print cros allfields nolists; fi - if [ "$e2e" = true ]; then $gam print cros allfields nolists; fi
- if [ "$e2e" = true ]; then $gam usageparameters customer
- if [ "$e2e" = true ]; then $gam usage customer parameters gmail:num_emails_sent,accounts:num_1day_logins
- if [ "$e2e" = true ]; then $gam report customer todrive; fi - if [ "$e2e" = true ]; then $gam report customer todrive; fi
- if [ "$e2e" = true ]; then $gam report users fulldatarequired accounts,gmail fields accounts:is_less_secure_apps_access_allowed,gmail:last_imap_time,gmail:last_pop_time filters "accounts:last_login_time>2019-01-01T00:00:00.000Z" todrive; fi - if [ "$e2e" = true ]; then $gam report users fields accounts:is_less_secure_apps_access_allowed,gmail:last_imap_time,gmail:last_pop_time filters "accounts:last_login_time>2019-01-01T00:00:00.000Z" todrive; fi
- if [ "$e2e" = true ]; then $gam report admin start -3d todrive; fi - if [ "$e2e" = true ]; then $gam report admin start -3d todrive; fi
before_deploy: before_deploy:

7
src/gapi/reports.py
View File

@@ -157,6 +157,9 @@ def showUsage():
start_date = datetime.datetime.now() + relativedelta(months=-1) start_date = datetime.datetime.now() + relativedelta(months=-1)
if not end_date: if not end_date:
end_date = datetime.datetime.now() end_date = datetime.datetime.now()
if orgUnitId:
for i in range(len(kwargs)):
kwargs[i-1]['orgUnitID'] = orgUnitId
one_day = datetime.timedelta(days=1) one_day = datetime.timedelta(days=1)
usage_on_date = start_date usage_on_date = start_date
titles.extend(parameters) titles.extend(parameters)
@@ -179,7 +182,7 @@ def showUsage():
customerId=customerId, customerId=customerId,
date=use_date, date=use_date,
parameters=','.join(parameters), parameters=','.join(parameters),
orgUnitId=orgUnitId, **kwarg) **kwarg)
except gapi.errors.GapiBadRequestError: except gapi.errors.GapiBadRequestError:
continue continue
for entity in usage: for entity in usage:
@@ -295,7 +298,7 @@ def showReport():
throw_reasons=throw_reasons, throw_reasons=throw_reasons,
date=tryDate, userKey=userKey, date=tryDate, userKey=userKey,
customerId=customerId, customerId=customerId,
orgUnitID=orgUnitId, orgUnitId=orgUnitId,
filters=filters, filters=filters,
parameters=parameters) parameters=parameters)
break break