Skip to content

Commit b4415d9

Browse files
committed
Fix: Reverted changes which occured due to departed-users api.
1 parent 3a1473a commit b4415d9

File tree

2 files changed

+4
-49
lines changed

2 files changed

+4
-49
lines changed

models/users.js

Lines changed: 2 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,8 @@ const firestore = require("../utils/firestore");
88
const { fetchWallet, createWallet } = require("../models/wallets");
99
const { updateUserStatus } = require("../models/userStatus");
1010
const { arraysHaveCommonItem, chunks } = require("../utils/array");
11-
const {
12-
ALLOWED_FILTER_PARAMS,
13-
FIRESTORE_IN_CLAUSE_SIZE,
14-
USERS_PATCH_HANDLER_SUCCESS_MESSAGES,
15-
USERS_PATCH_HANDLER_ERROR_MESSAGES,
16-
} = require("../constants/users");
11+
const { archiveUsers } = require("../services/users");
12+
const { ALLOWED_FILTER_PARAMS, FIRESTORE_IN_CLAUSE_SIZE } = require("../constants/users");
1713
const { DOCUMENT_WRITE_SIZE } = require("../constants/constants");
1814
const { userState } = require("../constants/userStatus");
1915
const { BATCH_SIZE_IN_CLAUSE } = require("../constants/firebase");
@@ -31,46 +27,6 @@ const { formatUsername } = require("../utils/username");
3127
const { logType } = require("../constants/logs");
3228
const { addLog } = require("../services/logService");
3329

34-
const archiveUsers = async (usersData) => {
35-
const batch = firestore.batch();
36-
const usersBatch = [];
37-
const summary = {
38-
totalUsersArchived: 0,
39-
totalOperationsFailed: 0,
40-
updatedUserDetails: [],
41-
failedUserDetails: [],
42-
};
43-
44-
usersData.forEach((user) => {
45-
const { id, first_name: firstName, last_name: lastName } = user;
46-
const updatedUserData = {
47-
...user,
48-
roles: {
49-
...user.roles,
50-
archived: true,
51-
},
52-
updated_at: Date.now(),
53-
};
54-
batch.update(userModel.doc(id), updatedUserData);
55-
usersBatch.push({ id, firstName, lastName });
56-
});
57-
58-
try {
59-
await batch.commit();
60-
summary.totalUsersArchived += usersData.length;
61-
summary.updatedUserDetails = [...usersBatch];
62-
return {
63-
message: USERS_PATCH_HANDLER_SUCCESS_MESSAGES.ARCHIVE_USERS.SUCCESSFULLY_COMPLETED_BATCH_UPDATES,
64-
...summary,
65-
};
66-
} catch (err) {
67-
logger.error("Firebase batch Operation Failed!");
68-
summary.totalOperationsFailed += usersData.length;
69-
summary.failedUserDetails = [...usersBatch];
70-
return { message: USERS_PATCH_HANDLER_ERROR_MESSAGES.ARCHIVE_USERS.BATCH_DATA_UPDATED_FAILED, ...summary };
71-
}
72-
};
73-
7430
/**
7531
* Adds or updates the user data
7632
*
@@ -1088,7 +1044,6 @@ const fetchUsersNotInDiscordServer = async () => {
10881044
};
10891045

10901046
module.exports = {
1091-
archiveUsers,
10921047
addOrUpdate,
10931048
fetchPaginatedUsers,
10941049
fetchUser,

test/unit/services/users.test.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ const firestore = require("../../../utils/firestore");
55
const userModel = firestore.collection("users");
66
const cleanDb = require("../../utils/cleanDb");
77
const userDataArray = require("../../fixtures/user/user")();
8-
const { generateUniqueUsername } = require("../../../services/users");
9-
const { addOrUpdate, archiveUsers } = require("../../../models/users");
8+
const { archiveUsers, generateUniqueUsername } = require("../../../services/users");
9+
const { addOrUpdate } = require("../../../models/users");
1010

1111
describe("Users services", function () {
1212
describe("archive inactive discord users in bulk", function () {

0 commit comments

Comments
 (0)