From 23ed20a298b663d104bac7948d507f4b972757f9 Mon Sep 17 00:00:00 2001
From: Jay Lee <jay0lee@gmail.com>
Date: Tue, 26 May 2026 16:15:03 +0000
Subject: [PATCH] user suspend/archive time support. #1920

---
 src/gam/__init__.py       | 8 +++++---
 src/gam/gamlib/gluprop.py | 4 ++++
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/gam/__init__.py b/src/gam/__init__.py
index 4e323299..379be2c4 100755
--- a/src/gam/__init__.py
+++ b/src/gam/__init__.py
@@ -47013,7 +47013,9 @@ USER_SCALAR_PROPERTY_PRINT_ORDER = [
   'ipWhitelisted',
   'suspended',
   'suspensionReason',
+  'suspensionTime',
   'archived',
+  'archivalTime',
   'changePasswordAtNextLogin',
   'id',
   'customerId',
@@ -47104,7 +47106,7 @@ USER_FIELDS_CHOICE_MAP = {
   'agreed2terms': 'agreedToTerms',
   'agreedtoterms': 'agreedToTerms',
   'aliases': ['aliases', 'nonEditableAliases'],
-  'archived': 'archived',
+  'archived': ['archived', 'archivalTime'],
   'changepassword': 'changePasswordAtNextLogin',
   'changepasswordatnextlogin': 'changePasswordAtNextLogin',
   'creationtime': 'creationTime',
@@ -47174,7 +47176,7 @@ USER_FIELDS_CHOICE_MAP = {
   'ssh': 'sshPublicKeys',
   'sshkeys': 'sshPublicKeys',
   'sshpublickeys': 'sshPublicKeys',
-  'suspended': ['suspended', 'suspensionReason'],
+  'suspended': ['suspended', 'suspensionReason', 'suspensionTime'],
   'thumbnailphotourl': 'thumbnailPhotoUrl',
   'username': 'primaryEmail',
   'website': 'websites',
@@ -47210,7 +47212,7 @@ USER_MULTI_ATTR_FILTER_CHOICE_MAP = {
 
 INFO_USER_OPTIONS = {'noaliases', 'nobuildingnames', 'nogroups', 'nolicenses', 'nolicences', 'noschemas', 'schemas', 'userview'}
 USER_SKIP_OBJECTS = {'thumbnailPhotoEtag'}
-USER_TIME_OBJECTS = {'creationTime', 'deletionTime', 'lastLoginTime'}
+USER_TIME_OBJECTS = {'creationTime', 'deletionTime', 'lastLoginTime', 'suspensionTime', 'archivalTime'}
 
 def _getUserMultiAttributeFilters(myarg, userMultiAttributeFilters):
   up = getChoice(USER_MULTI_ATTR_FILTER_CHOICE_MAP, mapChoice=True)
diff --git a/src/gam/gamlib/gluprop.py b/src/gam/gamlib/gluprop.py
index a06d0e59..b1fd3ebb 100644
--- a/src/gam/gamlib/gluprop.py
+++ b/src/gam/gamlib/gluprop.py
@@ -145,10 +145,14 @@ PROPERTIES = {
     {CLASS: PC_BOOLEAN, TITLE: 'IP Whitelisted',},
   'archived':
     {CLASS: PC_BOOLEAN, TITLE: 'Is Archived',},
+  'archivalTime':
+    {CLASS: PC_TIME, TITLE: 'Archival Time',},
   'suspended':
     {CLASS: PC_BOOLEAN, TITLE: 'Account Suspended',},
   'suspensionReason':
     {CLASS: PC_STRING, TITLE: 'Suspension Reason',},
+  'suspensionTime':
+    {CLASS: PC_TIME, TITLE: 'Suspension Time',},
   'changePasswordAtNextLogin':
     {CLASS: PC_BOOLEAN, TITLE: 'Must Change Password',},
   'recoveryEmail':