Skip to content
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

refactor: UsersService setOverDueDay -> withLendingInfo #574

Merged
merged 7 commits into from
Jul 11, 2023
Merged

refactor: UsersService setOverDueDay -> withLendingInfo #574

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
1f9c47a
refactor: if문 제거
scarf005 Jul 1, 2023
582d89f
refactor: reduce 사용
scarf005 Jul 1, 2023
5178b81
refactor: 객체 변경을 피함
scarf005 Jul 1, 2023
c3e9690
refactor: 변수명 통일
scarf005 Jul 1, 2023
65b0a7c
refactor: 메서드명을 동작과 일치하게 변경
scarf005 Jul 1, 2023
feaa8bd
docs: 메서드 설명 추가
scarf005 Jul 1, 2023
9f9f0ed
docs: TODO 추가
scarf005 Jul 11, 2023
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
36 changes: 17 additions & 19 deletions backend/src/users/users.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,24 +11,22 @@ export default class UsersService {
this.usersRepository = new UsersRepository();
}

async setOverDueDay(items: models.User[]): Promise<models.User[]> {
const usersIdList = items.map((user: models.User) => ({ userId: user.id }));
/**
* 기존 사용자 배열에 대출과 연체 정보를 추가하여 반환합니다.
*
* @returns 사용자의 대출 정보를 포함한 사용자 정보 배열
* @todo 대출 정보까지 함께 쿼리하는 searchUsersBy 메서드를 만들고 searchUserBy* 에서 사용하도록 수정
*/
async withLendingInfo(users: models.User[]): Promise<models.User[]> {
const usersIdList = users.map((user) => ({ userId: user.id }));
const lending = await this.usersRepository
.getLending(usersIdList) as unknown as models.Lending[];
if (items) {
return items.map((item: models.User) => {
const rtnObj: models.User = Object.assign(item);
rtnObj.lendings = lending.filter((lend) => lend.userId === item.id);
rtnObj.overDueDay = 0;
if (rtnObj.lendings.length) {
rtnObj.lendings.forEach((lend: models.Lending) => {
rtnObj.overDueDay += (+lend.overDueDay);
});
}
return rtnObj;
});
}
return items;

return users.map((user) => {
const lendings = lending.filter((lend) => lend.userId === user.id);
const overDueDay = lendings.reduce((acc, cur) => acc + cur.overDueDay, 0);
return { ...user, lendings, overDueDay };
});
}

async userLendings(userId: number) {
Expand All @@ -46,7 +44,7 @@ export default class UsersService {
{ nickname: Like(`%${nicknameOrEmail}%`) },
{ email: Like(`%${nicknameOrEmail}`) },
], limit, page);
const setItems = await this.setOverDueDay(items);
const setItems = await this.withLendingInfo(items);
const meta: types.Meta = {
totalItems: count,
itemCount: setItems.length,
Expand All @@ -59,7 +57,7 @@ export default class UsersService {

async searchUserById(id: number) {
let items = (await this.usersRepository.searchUserBy({ id }, 0, 0))[0];
items = await this.setOverDueDay(items);
items = await this.withLendingInfo(items);
return { items };
}

Expand All @@ -80,7 +78,7 @@ export default class UsersService {

async searchAllUsers(limit: number, page: number) {
const [items, count] = await this.usersRepository.searchUserBy(1, limit, page);
const setItems = await this.setOverDueDay(items);
const setItems = await this.withLendingInfo(items);
const meta: types.Meta = {
totalItems: count,
itemCount: setItems.length,
Expand Down