Skip to content

fix: modify about collect data by batch rtc_uuid #853

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 9, 2024
Merged

fix: modify about collect data by batch rtc_uuid #853

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
61 changes: 29 additions & 32 deletions src/v1/controller/user/agreement/GetToRtc.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,52 +47,49 @@ export class AgreementGetToRtc extends AbstractController<RequestType, ResponseT
const rtcUidstr = this.querystring.uid;
const room_uuid = this.querystring.room_uuid;
const rtcUids = rtcUidstr.split(",");
const listMap:Map<string, boolean> = new Map();
const userAgreementMap:Map<string, boolean> = new Map(rtcUids.map(rtc_uid => [rtc_uid, false]));
const length = rtcUids.length;
if (length > 0) {
let i = 0;
const batchQueryRtcUids: string[][] = [];
while (i < length) {
const j = i + 50;
batchQueryRtcUids.push(rtcUids.slice(i, j));
i = j;
}
for (const rtc_uids of batchQueryRtcUids) {
const roomUsersInfos = await dataSource
.createQueryBuilder(RoomUserModel, "ru")
.where("ru.room_uuid = :room_uuid", {
room_uuid,
})
.andWhere("ru.rtc_uid IN (:...rtc_uids)", { rtc_uids })
.getMany();

for (const rtc_uid of rtc_uids) {
listMap.set(rtc_uid, false);
}
const collectInfos = await dataSource
.createQueryBuilder(UserAgreementModel, "cInfo")
.where("cInfo.user_uuid IN (:...user_uuid)", { user_uuid: roomUsersInfos.map(c=> c && c.user_uuid) })
.getMany();

for (const rInfo of roomUsersInfos) {
listMap.set(rInfo.rtc_uid, true);
const rtc_uid = rInfo.rtc_uid;
const user_uuid = rInfo.user_uuid;
if (rtc_uid && user_uuid) {
const cInfo = collectInfos.find(c=> c && (c.user_uuid === user_uuid));
if (cInfo) {
listMap.set(rtc_uid, cInfo.is_agree_collect_data);
}
const batchedRtcUids = rtcUids.slice(i, j);
const roomUserInfos = await this.getRoomUserInfos(room_uuid, batchedRtcUids);
const userUuids = roomUserInfos.map(user => user.user_uuid);
const userAgreements = await this.getUserAgreements(userUuids);
for (const userInfo of roomUserInfos) {
const { rtc_uid, user_uuid } = userInfo;
const userAgreement = userAgreements.find(ua => ua.user_uuid === user_uuid);
if (userAgreement) {
userAgreementMap.set(rtc_uid, userAgreement.is_agree_collect_data);
} else {
userAgreementMap.set(rtc_uid, true);
}
}
i = j;
}
}
return {
status: Status.Success,
data: Object.fromEntries(listMap)
data: Object.fromEntries(userAgreementMap)
}
}


private async getRoomUserInfos(room_uuid: string, rtc_uids: string[]): Promise<RoomUserModel[]> {
return dataSource
.createQueryBuilder(RoomUserModel, "ru")
.where("ru.room_uuid = :room_uuid", { room_uuid })
.andWhere("ru.rtc_uid IN (:...rtc_uids)", { rtc_uids })
.getMany();
}
private async getUserAgreements(userUuids: string[]): Promise<UserAgreementModel[]> {
return dataSource
.createQueryBuilder(UserAgreementModel, "ua")
.where("ua.user_uuid IN (:...userUuids)", { userUuids })
.getMany();
}

public errorHandler(error: Error): ResponseError {
return this.autoHandlerError(error);
}
Expand Down
49 changes: 19 additions & 30 deletions src/v1/service/user/__tests__/userAgreement.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,47 +144,36 @@ test(`${namespace} - get user by rtc_uuid collect agreement`, async ava => {
ava.is(result?.user_uuid, result1?.user_uuid);

const rtcUids = [rtcUUID, rtcUUID1];
const userAgreementMap:Map<string, boolean> = new Map(rtcUids.map(rtc_uid => [rtc_uid, false]));
const length = rtcUids.length;
const listMap:Map<string, boolean> = new Map();
if (length > 0) {
let i = 0;
const batchQueryRtcUids: string[][] = [];
while (i < length) {
const j = i + 50;
batchQueryRtcUids.push(rtcUids.slice(i, j));
i = j;
}
for (const rtc_uids of batchQueryRtcUids) {
const roomUsersInfos = await dataSource
const batchedRtcUids = rtcUids.slice(i, j);
const roomUserInfos = await dataSource
.createQueryBuilder(RoomUserModel, "ru")
.where("ru.room_uuid = :room_uuid", {
room_uuid:roomUUID,
})
.andWhere("ru.rtc_uid IN (:...rtc_uids)", { rtc_uids })
.where("ru.room_uuid = :room_uuid", { room_uuid:roomUUID })
.andWhere("ru.rtc_uid IN (:...rtc_uids)", { rtc_uids: batchedRtcUids })
.getMany();

for (const rtc_uid of rtc_uids) {
listMap.set(rtc_uid, false);
}
const collectInfos = await dataSource
.createQueryBuilder(UserAgreementModel, "cInfo")
.where("cInfo.user_uuid IN (:...user_uuid)", { user_uuid: roomUsersInfos.map(c=> c && c.user_uuid) })
.getMany();

for (const rInfo of roomUsersInfos) {
listMap.set(rInfo.rtc_uid, true);
const rtc_uid = rInfo.rtc_uid;
const user_uuid = rInfo.user_uuid;
if (rtc_uid && user_uuid) {
const cInfo = collectInfos.find(c=> c && (c.user_uuid === user_uuid));
if (cInfo) {
listMap.set(rtc_uid, cInfo.is_agree_collect_data);
}
const userUuids = roomUserInfos.map(user => user.user_uuid);
const userAgreements = await dataSource
.createQueryBuilder(UserAgreementModel, "ua")
.where("ua.user_uuid IN (:...userUuids)", { userUuids })
.getMany();;
for (const userInfo of roomUserInfos) {
const { rtc_uid, user_uuid } = userInfo;
const userAgreement = userAgreements.find(ua => ua.user_uuid === user_uuid);
if (userAgreement) {
userAgreementMap.set(rtc_uid, userAgreement.is_agree_collect_data);
} else {
userAgreementMap.set(rtc_uid, true);
}
}
i = j;
}
}
const obj = Object.fromEntries(listMap);
const obj = Object.fromEntries(userAgreementMap);

ava.is(result1?.is_agree_collect_data, obj?.[rtcUUID]);

Expand Down