deepblue/GoogleDriveManagement
1
0
Fork 0
mirror of https://github.com/GAM-team/GAM.git synced 2026-06-28 18:01:36 +00:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

Added option showdeleted [<Boolean>]' to gam <UserTypeEntity> print|show chatmessages`.

Browse Source 
Updated commands that call the Reports API (including `gam info domain`) to handle a change
in the Reports API that generated the following warning:
```
WARNING: End date greater than LastReportedDate.
This commit is contained in:
Ross Scroggs
2023-09-07 09:03:00 -07:00
parent ed62abe464
commit c30931545f
6 changed files with 54 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/gam/__init__.py
View File

@@ -12479,14 +12479,23 @@ def doWhatIs():
entityUnknownWarning(Ent.EMAIL, email)
setSysExitRC(ENTITY_IS_UKNOWN_RC)
def _adjustTryDate(errMsg, noDateChange):
def _adjustTryDate(errMsg, noDateChange, prevTryDate):
match_date = re.match('Data for dates later than (.*) is not yet available. Please check back later', errMsg)
if not match_date:
if match_date:
tryDate = match_date.group(1)
else:
match_date = re.match('Start date can not be later than (.*)', errMsg)
if match_date:
tryDate = match_date.group(1)
else:
match_date = re.match('End date greater than LastReportedDate.', errMsg)
if match_date:
tryDateTime = datetime.datetime.strptime(prevTryDate, YYYYMMDD_FORMAT)-datetime.timedelta(days=1)
tryDate = tryDateTime.strftime(YYYYMMDD_FORMAT)
if (not match_date) or noDateChange:
printWarningMessage(DATA_NOT_AVALIABLE_RC, errMsg)
return None
return match_date.group(1)
return tryDate
def _checkDataRequiredServices(result, tryDate, dataRequiredServices, parameterServices=None, checkUserEmail=False):
# -1: Data not available:
@@ -12594,7 +12603,7 @@ def doReportUsageParameters():
printErrorMessage(BAD_REQUEST_RC, Msg.BAD_REQUEST)
return
except GAPI.invalid as e:
tryDate = _adjustTryDate(str(e), False)
tryDate = _adjustTryDate(str(e), False, tryDate)
if not tryDate:
break
for parameter in sorted(allParameters):
@@ -13373,7 +13382,7 @@ def doReport():
if not status:
break
except GAPI.invalid as e:
tryDate = _adjustTryDate(str(e), noDateChange)
tryDate = _adjustTryDate(str(e), noDateChange, tryDate)
if not tryDate:
break
startDateTime = endDateTime = datetime.datetime.strptime(tryDate, YYYYMMDD_FORMAT)
@@ -13450,7 +13459,7 @@ def doReport():
if not status:
break
except GAPI.invalid as e:
tryDate = _adjustTryDate(str(e), noDateChange)
tryDate = _adjustTryDate(str(e), noDateChange, tryDate)
if not tryDate:
break
startDateTime = endDateTime = datetime.datetime.strptime(tryDate, YYYYMMDD_FORMAT)
@@ -15338,7 +15347,7 @@ def _showCustomerLicenseInfo(customerInfo, FJQC):
continue
break
except GAPI.invalid as e:
tryDate = _adjustTryDate(str(e), False)
tryDate = _adjustTryDate(str(e), False, tryDate)
if not tryDate:
return
continue
@@ -25265,10 +25274,10 @@ def doInfoChatMessage():
infoChatMessage([None])
# gam <UserTypeEntity> show chatmessages <ChatSpace>
# [filter <String>]
# [showdeleted [<Boolean>]] [filter <String>]
# [formatjson]
# gam <UserTypeEntity> print chatmessages [todrive <ToDriveAttribute>*] <ChatSpace>i
# [filter <String>]
# [showdeleted [<Boolean>]] [filter <String>]
# [formatjson [quotechar <Character>]]
def printShowChatMessages(users):
def _printChatMessage(user, message):
@@ -25289,12 +25298,15 @@ def printShowChatMessages(users):
csvPF = CSVPrintFile(['User', 'name'] if not isinstance(users, list) else ['name']) if Act.csvFormat() else None
FJQC = FormatJSONQuoteChar(csvPF)
parent = pfilter = None
showDeleted = False
while Cmd.ArgumentsRemaining():
myarg = getArgument()
if csvPF and myarg == 'todrive':
csvPF.GetTodriveParameters()
elif myarg == 'space' or myarg.startswith('spaces/'):
parent = getChatSpace(myarg)
elif myarg == 'showdeleted':
showDeleted = getBoolean()
elif myarg =='filter':
pfilter = getString(Cmd.OB_STRING)
else:
@@ -25314,9 +25326,10 @@ def printShowChatMessages(users):
messages = callGAPIpages(chat.spaces().messages(), 'list', 'messages',
pageMessage=_getChatPageMessage(Ent.CHAT_MESSAGE, user, i, count, qfilter),
throwReasons=[GAPI.NOT_FOUND, GAPI.INVALID_ARGUMENT, GAPI.PERMISSION_DENIED],
pageSize=CHAT_PAGE_SIZE, parent=parent, filter=pfilter)
pageSize=CHAT_PAGE_SIZE, parent=parent, filter=pfilter, showDeleted=showDeleted)
for message in messages:
_getChatSenderEmail(cd, message['sender'])
if 'sender' in message:
_getChatSenderEmail(cd, message['sender'])
except (GAPI.notFound, GAPI.invalidArgument, GAPI.permissionDenied) as e:
exitIfChatNotConfigured(chat, kvList, str(e), i, count)
continue