Rolling back some of the renaming

Author: sgoumaz

components/api-server/bin/nightly

@@ -55,7 +55,7 @@ async function runNightlyTasks (storageLayer, storageSize) {
 
   // Retrieve all existing users
   const usersRepository = await getUsersRepository();
-  const users = await usersRepository.getAllBuiltOnSystemStreams();
+  const users = await usersRepository.getAll();
 
   // Compute storage size used by each user
   for (const user of users) {

components/api-server/test/account.test.js

@@ -256,7 +256,7 @@ describe('[ACCO] account', function () {
       assert.approximately(storageUsed.attachedFiles, initialStorageUsed.attachedFiles +
         newAtt.size, filesystemBlockSize);
       const updatedStorageUsed = storageUsed;
-      const retrievedUser = await usersRepository.getUserBuiltOnSystemStreamsById(user.id);
+      const retrievedUser = await usersRepository.getUserById(user.id);
       assert.deepEqual(retrievedUser.storageUsed, updatedStorageUsed);
     });
 
@@ -302,7 +302,7 @@ describe('[ACCO] account', function () {
       const newAtt = testData.attachments.image;
       async.series([
         async function checkInitial () {
-          const retrievedUser = await usersRepository.getUserBuiltOnSystemStreamsById(user.id);
+          const retrievedUser = await usersRepository.getUserById(user.id);
           initialStorageUsed = retrievedUser.storageUsed;
         },
         function addAttachment (stepDone) {
@@ -314,7 +314,7 @@ describe('[ACCO] account', function () {
             });
         },
         async function checkUpdated () {
-          const retrievedUser = await usersRepository.getUserBuiltOnSystemStreamsById(user.id);
+          const retrievedUser = await usersRepository.getUserById(user.id);
           initialStorageUsed = retrievedUser.storageUsed;
           retrievedUser.storageUsed.dbDocuments.should.eql(initialStorageUsed.dbDocuments);
           retrievedUser.storageUsed.attachedFiles.should.be.approximately(

components/api-server/test/deletion.test.js

@@ -222,7 +222,7 @@ describe('[PGTD] DELETE /users/:username', () => {
           assert.equal(res.body.userDeletion.username, username1);
         });
         it(`[${testIDs[i][1]}] should delete user entries from impacted collections`, async function () {
-          const user = await usersRepository.getUserBuiltOnSystemStreamsById(username1);
+          const user = await usersRepository.getUserById(username1);
           assert.notExists(user);
           const dbCollections = [
             app.storageLayer.accesses,
@@ -276,7 +276,7 @@ describe('[PGTD] DELETE /users/:username', () => {
           }
         });
         it(`[${testIDs[i][3]}] should not delete entries of other users`, async function () {
-          const user = await usersRepository.getUserBuiltOnSystemStreamsById(username2);
+          const user = await usersRepository.getUserById(username2);
           assert.exists(user);
           const dbCollections = [app.storageLayer.accesses];
           if (!isOpenSource) { dbCollections.push(app.storageLayer.webhooks); }

components/api-server/test/system.test.js

@@ -196,7 +196,7 @@ describe('[SYER] system (ex-register)', function () {
         await (new Promise(server.ensureStarted.bind(server, settings)));
 
         const usersRepository = await getUsersRepository();
-        const originalUsers = await usersRepository.getAllBuiltOnSystemStreams();
+        const originalUsers = await usersRepository.getAll();
 
         const originalCount = originalUsers.length;
         // create user
@@ -209,7 +209,7 @@ describe('[SYER] system (ex-register)', function () {
         mailSent.should.eql(true);
 
         // getUpdatedUsers
-        const users = await usersRepository.getAllBuiltOnSystemStreams(true);
+        const users = await usersRepository.getAll(true);
         users.length.should.eql(originalCount + 1, 'users');
 
         const expected = _.cloneDeep(newUserData);
@@ -295,7 +295,7 @@ describe('[SYER] system (ex-register)', function () {
           await (new Promise(server.ensureStarted.bind(server, settings)));
 
           const usersRepository = await getUsersRepository();
-          const originalUsers = await usersRepository.getAllBuiltOnSystemStreams();
+          const originalUsers = await usersRepository.getAll();
           const originalCount = originalUsers.length;
 
           // create user
@@ -314,7 +314,7 @@ describe('[SYER] system (ex-register)', function () {
           const createdUserId = res.body.id;
 
           // getUpdatedUsers
-          const users = await usersRepository.getAllBuiltOnSystemStreams();
+          const users = await usersRepository.getAll();
           users.length.should.eql(originalCount, 'users');
           should.not.exist(_.find(users, { id: createdUserId }));
         });

components/business/src/users/repository.js

@@ -52,13 +52,13 @@ class UsersRepository {
    * only for testing and built-in register
    * @returns {Promise<{ id: string, username: string, events: any[] }[]>}
    */
-  async getAllBuiltOnSystemStreams () {
+  async getAll () {
     const usersMap = await this.usersIndex.getAllByUsername();
     const users = [];
     for (const [username, userId] of Object.entries(usersMap)) {
-      const user = await this.getUserBuiltOnSystemStreamsById(userId);
+      const user = await this.getUserById(userId);
       if (user == null) {
-        throw new Error(`Repository inconsistency: user index lists user with id: "${userId}" and username: "${username}", but cannot get it with getUserBuiltOnSystemStreamsById()`);
+        throw new Error(`Repository inconsistency: user index lists user with id: "${userId}" and username: "${username}", but cannot get it with getUserById()`);
       }
       users.push(user);
     }
@@ -103,7 +103,7 @@ class UsersRepository {
    * @param {string} userId
    * @returns {Promise<{ id: string, username: string, events: any[] }>}
    */
-  async getUserBuiltOnSystemStreamsById (userId) {
+  async getUserById (userId) {
     const userAccountStreamsIds = Object.keys(SystemStreamsSerializer.getAccountMap());
     const query = {
       state: 'all',
@@ -150,7 +150,7 @@ class UsersRepository {
   async getUserByUsername (username) {
     const userId = await this.getUserIdForUsername(username);
     if (userId) {
-      const user = await this.getUserBuiltOnSystemStreamsById(userId);
+      const user = await this.getUserById(userId);
       return user;
     }
     return null;
@@ -342,7 +342,7 @@ class UsersRepository {
    * @returns {Promise<number>}
    */
   async deleteOne (userId, username, skipFowardToRegister) {
-    const user = await this.getUserBuiltOnSystemStreamsById(userId);
+    const user = await this.getUserById(userId);
     if (username == null) {
       username = user?.username;
     }

components/hfs-server/test/acceptance/store_data.test.js

@@ -205,7 +205,7 @@ describe('[SDHF] Storing data in a HF series', function () {
     async function tryStore (attrs, header, data) {
       const effectiveAttrs = lodash.merge({ streamIds: [parentStreamId], time: Date.now() / 1000 }, attrs);
       const usersRepository = await getUsersRepository();
-      const user = await usersRepository.getUserBuiltOnSystemStreamsById(userId);
+      const user = await usersRepository.getUserById(userId);
       assert.isNotNull(user);
       const event = await mall.events.create(user.id, effectiveAttrs);
       const requestData = {
@@ -603,7 +603,7 @@ describe('[SDHF] Storing data in a HF series', function () {
       async function tryStore (attrs, header, data) {
         const effectiveAttrs = lodash.merge({ streamIds: [parentStreamId], time: Date.now() / 1000 }, attrs);
         const usersRepository = await getUsersRepository();
-        const user = await usersRepository.getUserBuiltOnSystemStreamsById(userId);
+        const user = await usersRepository.getUserById(userId);
         assert.isNotNull(user);
         const event = await mall.events.create(user.id, effectiveAttrs);
         const requestData = {

components/platform/src/platformCheckIntegrity.js

@@ -21,7 +21,7 @@ module.exports = async function platformCheckIntegrity (platformWideDB) {
   const errors = [];
   // Retrieve all existing users
   const usersRepository = await getUsersRepository();
-  const usersFromRepository = await usersRepository.getAllBuiltOnSystemStreams();
+  const usersFromRepository = await usersRepository.getAll();
   const indexedFields = SystemStreamsSerializer.getIndexedAccountStreamsIdsWithoutPrefix();
 
   const infos = {

components/storage/src/migrations/1.8.0.js

@@ -47,7 +47,7 @@ module.exports = async function (context, callback) {
     await platformWideDB.init();
     // Retrieve all existing users
     const usersRepository = await getUsersRepository();
-    const users = await usersRepository.getAllBuiltOnSystemStreams();
+    const users = await usersRepository.getAll();
     const indexedFields = SystemStreamsSerializer.getIndexedAccountStreamsIdsWithoutPrefix();
     for (let i = 0; i < users.length; i++) {
       const user = users[i];