feat: use deprecated_at field

Author: alexey-yarmosh

snapshots/collections-schema.yml

@@ -801,7 +801,7 @@ fields:
       readonly: true
       required: false
       searchable: true
-      sort: null
+      sort: 10
       special:
         - date-created
       translations: null
@@ -826,35 +826,35 @@ fields:
       foreign_key_table: null
       foreign_key_column: null
   - collection: directus_users
-    field: date_updated
-    type: timestamp
+    field: notification_preferences
+    type: json
     meta:
       collection: directus_users
       conditions: null
       display: null
       display_options: null
-      field: date_updated
+      field: notification_preferences
       group: null
-      hidden: false
-      interface: datetime
+      hidden: true
+      interface: input-code
       note: null
-      options: {}
-      readonly: true
+      options: null
+      readonly: false
       required: false
       searchable: true
-      sort: 10
+      sort: 8
       special:
-        - date-updated
+        - cast-json
       translations: null
       validation: null
       validation_message: null
       width: full
     schema:
-      name: date_updated
+      name: notification_preferences
       table: directus_users
-      data_type: timestamp
+      data_type: longtext
       default_value: null
-      max_length: null
+      max_length: 4294967295
       numeric_precision: null
       numeric_scale: null
       is_nullable: true
@@ -867,35 +867,75 @@ fields:
       foreign_key_table: null
       foreign_key_column: null
   - collection: directus_users
-    field: notification_preferences
-    type: json
+    field: deprecated_prefix
+    type: string
     meta:
       collection: directus_users
       conditions: null
       display: null
       display_options: null
-      field: notification_preferences
+      field: deprecated_prefix
       group: null
-      hidden: true
-      interface: input-code
+      hidden: false
+      interface: input
       note: null
       options: null
       readonly: false
       required: false
       searchable: true
-      sort: 8
+      sort: 9
+      special: null
+      translations: null
+      validation: null
+      validation_message: null
+      width: full
+    schema:
+      name: deprecated_prefix
+      table: directus_users
+      data_type: varchar
+      default_value: null
+      max_length: 255
+      numeric_precision: null
+      numeric_scale: null
+      is_nullable: true
+      is_unique: false
+      is_indexed: true
+      is_primary_key: false
+      is_generated: false
+      generation_expression: null
+      has_auto_increment: false
+      foreign_key_table: null
+      foreign_key_column: null
+  - collection: directus_users
+    field: date_updated
+    type: timestamp
+    meta:
+      collection: directus_users
+      conditions: null
+      display: null
+      display_options: null
+      field: date_updated
+      group: null
+      hidden: false
+      interface: datetime
+      note: null
+      options: {}
+      readonly: true
+      required: false
+      searchable: true
+      sort: 11
       special:
-        - cast-json
+        - date-updated
       translations: null
       validation: null
       validation_message: null
       width: full
     schema:
-      name: notification_preferences
+      name: date_updated
       table: directus_users
-      data_type: longtext
+      data_type: timestamp
       default_value: null
-      max_length: 4294967295
+      max_length: null
       numeric_precision: null
       numeric_scale: null
       is_nullable: true
@@ -908,39 +948,39 @@ fields:
       foreign_key_table: null
       foreign_key_column: null
   - collection: directus_users
-    field: deprecated_prefix
-    type: string
+    field: suspended_at
+    type: timestamp
     meta:
       collection: directus_users
       conditions: null
       display: null
       display_options: null
-      field: deprecated_prefix
+      field: suspended_at
       group: null
       hidden: false
-      interface: input
+      interface: datetime
       note: null
       options: null
       readonly: false
       required: false
       searchable: true
-      sort: 9
+      sort: 12
       special: null
       translations: null
       validation: null
       validation_message: null
       width: full
     schema:
-      name: deprecated_prefix
+      name: suspended_at
       table: directus_users
-      data_type: varchar
+      data_type: timestamp
       default_value: null
-      max_length: 255
+      max_length: null
       numeric_precision: null
       numeric_scale: null
       is_nullable: true
       is_unique: false
-      is_indexed: true
+      is_indexed: false
       is_primary_key: false
       is_generated: false
       generation_expression: null

src/extensions/operations/remove-banned-users-cron-handler/src/actions/remove-banned-users.ts

@@ -34,5 +34,5 @@ export const removeBannedUsers = async (context: OperationContext) => {
 };
 
 const isSuspensionExpired = (user: DirectusUser) => {
-	return !!user.date_updated && Date.now() - new Date(user.date_updated).getTime() > SUSPENSION_PERIOD;
+	return !!user.suspended_at && Date.now() - new Date(user.suspended_at).getTime() > SUSPENSION_PERIOD;
 };

src/extensions/operations/remove-banned-users-cron-handler/src/repositories/directus.ts

@@ -10,7 +10,7 @@ export const getDirectusUsers = async ({ services, getSchema }: OperationContext
 	});
 
 	const result = await usersService.readByQuery({
-		fields: [ 'id', 'external_identifier', 'github_username', 'status', 'date_updated' ],
+		fields: [ 'id', 'external_identifier', 'github_username', 'status', 'suspended_at' ],
 	}) as DirectusUser[];
 	return result;
 };
@@ -23,7 +23,7 @@ export const suspendUser = async (user: DirectusUser, context: OperationContext)
 	await database.transaction(async (trx) => {
 		const usersService = new UsersService({ schema, knex: trx });
 
-		await usersService.updateOne(user.id, { status: 'suspended' });
+		await usersService.updateOne(user.id, { status: 'suspended', suspended_at: new Date().toISOString() });
 		await deleteUserTokens(user, trx, context);
 	});
 };
@@ -46,7 +46,7 @@ export const activateUser = async (user: DirectusUser, { services, getSchema }:
 		schema: await getSchema(),
 	});
 
-	await usersService.updateOne(user.id, { status: 'active' });
+	await usersService.updateOne(user.id, { status: 'active', suspended_at: null });
 };
 
 export const deleteUser = async (user: DirectusUser, { services, getSchema }: OperationContext) => {

src/extensions/operations/remove-banned-users-cron-handler/src/types.ts

@@ -3,5 +3,5 @@ export type DirectusUser = {
 	external_identifier: string;
 	github_username: string | null;
 	status: string;
-	date_updated: string | null;
+	suspended_at: string | null;
 };

src/extensions/operations/remove-banned-users-cron-handler/test/api.test.ts

@@ -80,7 +80,7 @@ describe('Remove banned users CRON handler', () => {
 		const result = await operationApi.handler({}, context);
 
 		expect(nock.isDone()).to.equal(true);
-		expect(updateOne.calledOnceWithExactly('2', { status: 'suspended' })).to.equal(true);
+		expect(updateOne.calledOnceWith('2', sinon.match({ status: 'suspended', suspended_at: sinon.match.string }))).to.equal(true);
 		expect(deleteByQuery.calledOnceWithExactly({ filter: { user_created: { _eq: '2' } } })).to.equal(true);
 		expect(deleteOne.callCount).to.equal(0);
 		expect(result).to.equal('Users suspended: [2]; activated: []; deleted: [].');
@@ -92,15 +92,15 @@ describe('Remove banned users CRON handler', () => {
 			github_username: 'restored_user',
 			external_identifier: '2',
 			status: 'suspended',
-			date_updated: new Date().toISOString(),
+			suspended_at: new Date().toISOString(),
 		}]);
 
 		nockGithubLogins([{ databaseId: 2 }]);
 
 		const result = await operationApi.handler({}, context);
 
 		expect(nock.isDone()).to.equal(true);
-		expect(updateOne.calledOnceWithExactly('2', { status: 'active' })).to.equal(true);
+		expect(updateOne.calledOnceWithExactly('2', { status: 'active', suspended_at: null })).to.equal(true);
 		expect(deleteOne.callCount).to.equal(0);
 		expect(result).to.equal('Users suspended: []; activated: [2]; deleted: [].');
 	});
@@ -111,7 +111,7 @@ describe('Remove banned users CRON handler', () => {
 			github_username: 'banned_user',
 			external_identifier: '2',
 			status: 'suspended',
-			date_updated: yearAgo(),
+			suspended_at: yearAgo(),
 		}]);
 
 		nockGithubLogins([ null ]);
@@ -131,7 +131,7 @@ describe('Remove banned users CRON handler', () => {
 			github_username: 'banned_user',
 			external_identifier: '2',
 			status: 'suspended',
-			date_updated: new Date().toISOString(),
+			suspended_at: new Date().toISOString(),
 		}]);
 
 		nockGithubLogins([ null ]);