feat(events): save history username changes

filipedeschamps · Jun 19, 2024 · 8540a5a · 8540a5a
1 parent 3c0d7d7
commit 8540a5a
Show file tree

Hide file tree

Showing 9 changed files with 689 additions and 157 deletions.
diff --git a/models/event.js b/models/event.js
@@ -43,13 +43,7 @@ function validateObject(object) {
   return cleanObject;
 }
 
-async function findAll() {
-  const results = await database.query('SELECT * FROM events;');
-  return results.rows;
-}
-
 export default Object.freeze({
   create,
   updateMetadata,
-  findAll,
 });
diff --git a/pages/api/v1/contents/[username]/[slug]/index.public.js b/pages/api/v1/contents/[username]/[slug]/index.public.js
@@ -147,7 +147,7 @@ async function patchHandler(request, response) {
 
     const currentEvent = await event.create(
       {
-        type: filteredBodyValues.parent_id ? 'update:content:text_child' : 'update:content:text_root',
+        type: contentToBeUpdated.parent_id ? 'update:content:text_child' : 'update:content:text_root',
         originatorUserId: request.context.user.id,
         originatorIp: request.context.clientIp,
       },

diff --git a/pages/api/v1/users/[username]/index.public.js b/pages/api/v1/users/[username]/index.public.js
@@ -163,6 +163,13 @@ async function patchHandler(request, response) {
     for (const field of updatableFields) {
       if (originalUser[field] !== updatedUser[field]) {
         metadata.updatedFields.push(field);
+
+        if (field === 'username') {
+          metadata.username = {
+            old: originalUser.username,
+            new: updatedUser.username,
+          };
+        }
       }
     }
 

diff --git a/tests/integration/api/v1/contents/firewall.post.test.js b/tests/integration/api/v1/contents/firewall.post.test.js
@@ -1,7 +1,6 @@
 import { version as uuidVersion } from 'uuid';
 
 import content from 'models/content.js';
-import event from 'models/event.js';
 import orchestrator from 'tests/orchestrator.js';
 
 beforeEach(async () => {
@@ -61,9 +60,9 @@ describe('POST /api/v1/contents [FIREWALL]', () => {
       const request2Body = await request2.json();
       const request3Body = await request3.json();
 
-      expect(request1.status).toBe(201);
-      expect(request2.status).toBe(201);
-      expect(request3.status).toBe(429);
+      expect.soft(request1.status).toBe(201);
+      expect.soft(request2.status).toBe(201);
+      expect.soft(request3.status).toBe(429);
 
       expect(request3Body).toStrictEqual({
         name: 'TooManyRequestsError',
@@ -96,18 +95,22 @@ describe('POST /api/v1/contents [FIREWALL]', () => {
       expect(content2.status).toStrictEqual('draft');
       expect(content3).toStrictEqual(undefined);
 
-      const events = await event.findAll();
-      expect(events.length).toEqual(3);
+      const lastEvent = await orchestrator.getLastEvent();
 
-      expect(uuidVersion(events[2].id)).toEqual(4);
-      expect(events[2].type).toEqual('firewall:block_contents:text_root');
-      expect(events[2].originator_user_id).toEqual(defaultUser.id);
-      expect(events[2].originator_ip).toEqual('127.0.0.1');
-      expect(events[2].metadata).toEqual({
-        from_rule: 'create:content:text_root',
-        contents: [content1.id, content2.id],
+      expect(lastEvent).toStrictEqual({
+        id: lastEvent.id,
+        type: 'firewall:block_contents:text_root',
+        originator_user_id: defaultUser.id,
+        originator_ip: '127.0.0.1',
+        metadata: {
+          from_rule: 'create:content:text_root',
+          contents: [content1.id, content2.id],
+        },
+        created_at: lastEvent.created_at,
       });
-      expect(Date.parse(events[2].created_at)).not.toEqual(NaN);
+
+      expect(uuidVersion(lastEvent.id)).toBe(4);
+      expect(Date.parse(lastEvent.created_at)).not.toBe(NaN);
     });
 
     test('Spamming valid "child" contents', async () => {
@@ -176,9 +179,9 @@ describe('POST /api/v1/contents [FIREWALL]', () => {
       const request2Body = await request2.json();
       const request3Body = await request3.json();
 
-      expect(request1.status).toBe(201);
-      expect(request2.status).toBe(201);
-      expect(request3.status).toBe(429);
+      expect.soft(request1.status).toBe(201);
+      expect.soft(request2.status).toBe(201);
+      expect.soft(request3.status).toBe(429);
 
       expect(request3Body).toStrictEqual({
         name: 'TooManyRequestsError',
@@ -211,18 +214,22 @@ describe('POST /api/v1/contents [FIREWALL]', () => {
       expect(content2.status).toStrictEqual('draft');
       expect(content3).toStrictEqual(undefined);
 
-      const events = await event.findAll();
-      expect(events.length).toEqual(4);
+      const lastEvent = await orchestrator.getLastEvent();
 
-      expect(uuidVersion(events[3].id)).toEqual(4);
-      expect(events[3].type).toEqual('firewall:block_contents:text_child');
-      expect(events[3].originator_user_id).toEqual(defaultUser.id);
-      expect(events[3].originator_ip).toEqual('127.0.0.1');
-      expect(events[3].metadata).toEqual({
-        from_rule: 'create:content:text_child',
-        contents: [content1.id, content2.id],
+      expect(lastEvent).toStrictEqual({
+        id: lastEvent.id,
+        type: 'firewall:block_contents:text_child',
+        originator_user_id: defaultUser.id,
+        originator_ip: '127.0.0.1',
+        metadata: {
+          from_rule: 'create:content:text_child',
+          contents: [content1.id, content2.id],
+        },
+        created_at: lastEvent.created_at,
       });
-      expect(Date.parse(events[3].created_at)).not.toEqual(NaN);
+
+      expect(uuidVersion(lastEvent.id)).toBe(4);
+      expect(Date.parse(lastEvent.created_at)).not.toBe(NaN);
     });
   });
 });
diff --git a/tests/integration/api/v1/events/get.test.js b/tests/integration/api/v1/events/get.test.js
diff --git a/tests/integration/api/v1/users/firewall.post.test.js b/tests/integration/api/v1/users/firewall.post.test.js
@@ -1,6 +1,5 @@
 import { version as uuidVersion } from 'uuid';
 
-import event from 'models/event.js';
 import user from 'models/user.js';
 import orchestrator from 'tests/orchestrator.js';
 
@@ -54,9 +53,9 @@ describe('POST /api/v1/users [FIREWALL]', () => {
       const request2Body = await request2.json();
       const request3Body = await request3.json();
 
-      expect(request1.status).toBe(201);
-      expect(request2.status).toBe(201);
-      expect(request3.status).toBe(429);
+      expect.soft(request1.status).toBe(201);
+      expect.soft(request2.status).toBe(201);
+      expect.soft(request3.status).toBe(429);
 
       expect(request3Body).toStrictEqual({
         name: 'TooManyRequestsError',
@@ -76,18 +75,22 @@ describe('POST /api/v1/users [FIREWALL]', () => {
       expect(user1.features).toStrictEqual([]);
       expect(user2.features).toStrictEqual([]);
 
-      const events = await event.findAll();
-      expect(events.length).toEqual(3);
+      const lastEvent = await orchestrator.getLastEvent();
 
-      expect(uuidVersion(events[2].id)).toEqual(4);
-      expect(events[2].type).toEqual('firewall:block_users');
-      expect(events[2].originator_user_id).toEqual(null);
-      expect(events[2].originator_ip).toEqual('127.0.0.1');
-      expect(events[2].metadata).toEqual({
-        from_rule: 'create:user',
-        users: [user1.id, user2.id],
+      expect(lastEvent).toStrictEqual({
+        id: lastEvent.id,
+        type: 'firewall:block_users',
+        originator_user_id: null,
+        originator_ip: '127.0.0.1',
+        metadata: {
+          from_rule: 'create:user',
+          users: [user1.id, user2.id],
+        },
+        created_at: lastEvent.created_at,
       });
-      expect(Date.parse(events[2].created_at)).not.toEqual(NaN);
+
+      expect(uuidVersion(lastEvent.id)).toBe(4);
+      expect(Date.parse(lastEvent.created_at)).not.toBe(NaN);
     });
   });
 });