학번 없는 유저 처리 (#256)

* 학번 없는 유저 처리 * 테스트 수정
bacchus-snu · Mar 22, 2024 · c2d4ef7 · c2d4ef7
1 parent ac676de
commit c2d4ef7
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 9 deletions.
diff --git a/src/model/users.ts b/src/model/users.ts
@@ -500,20 +500,17 @@ export default class Users {
     tr: Transaction,
     userIdx: number,
   ): Promise<Array<string>> {
-    const query = 'SELECT sn.student_number FROM users u '
-      + 'LEFT OUTER JOIN student_numbers AS sn ON sn.owner_idx = u.idx '
-      + 'WHERE u.idx = $1';
-    const result = await tr.query<{ idx: number; student_number: string }>(query, [userIdx]);
+    const query = 'SELECT student_number FROM student_numbers WHERE owner_idx = $1';
+    const result = await tr.query<{ student_number: string }>(query, [userIdx]);
     return result.rows.map(row => row.student_number);
   }
 
   public async getStudentNumbersByUserIdxBulk(
     tr: Transaction,
     userIndices: Array<number>,
   ): Promise<Map<number, Array<string>>> {
-    const query = 'SELECT u.idx, sn.student_number FROM users u '
-      + 'LEFT OUTER JOIN student_numbers AS sn ON sn.owner_idx = u.idx '
-      + 'WHERE u.idx = ANY($1)';
+    const query = 'SELECT owner_idx as idx, student_number FROM student_numbers '
+      + 'WHERE owner_idx = ANY($1)';
     const result = await tr.query<{ idx: number; student_number: string }>(query, [userIndices]);
     const map = new Map<number, Array<string>>();
     for (const row of result.rows) {

diff --git a/test/api/groups.test.ts b/test/api/groups.test.ts
@@ -109,14 +109,23 @@ test('member listing', async t => {
   let memberUserIdx = 0;
   await model.pgDo(async tr => {
     memberUserIdx = await createUser(tr, model);
-    await model.users.addStudentNumber(tr, memberUserIdx, uuid());
     await model.users.addUserMembership(tr, memberUserIdx, groupIdx);
   }, ['users']);
 
   response = await agent.get(`/api/group/${groupIdx}/members`);
   t.is(response.status, 200);
   t.is(response.body.length, 1);
   t.is(response.body[0].uid, memberUserIdx);
+  t.deepEqual(response.body[0].studentNumbers, []);
+
+  const studentNumber = uuid();
+  await model.pgDo(tr => model.users.addStudentNumber(tr, memberUserIdx, studentNumber));
+
+  response = await agent.get(`/api/group/${groupIdx}/members`);
+  t.is(response.status, 200);
+  t.is(response.body.length, 1);
+  t.is(response.body[0].uid, memberUserIdx);
+  t.deepEqual(response.body[0].studentNumbers, [studentNumber]);
 });
 
 test('pending listing', async t => {
@@ -157,14 +166,23 @@ test('pending listing', async t => {
   let pendingUserIdx = 0;
   await model.pgDo(async tr => {
     pendingUserIdx = await createUser(tr, model);
-    await model.users.addStudentNumber(tr, pendingUserIdx, uuid());
     await model.users.addPendingUserMembership(tr, pendingUserIdx, groupIdx);
   }, ['users']);
 
   response = await agent.get(`/api/group/${groupIdx}/pending`);
   t.is(response.status, 200);
   t.is(response.body.length, 1);
   t.is(response.body[0].uid, pendingUserIdx);
+  t.deepEqual(response.body[0].studentNumbers, []);
+
+  const studentNumber = uuid();
+  await model.pgDo(tr => model.users.addStudentNumber(tr, pendingUserIdx, studentNumber));
+
+  response = await agent.get(`/api/group/${groupIdx}/pending`);
+  t.is(response.status, 200);
+  t.is(response.body.length, 1);
+  t.is(response.body[0].uid, pendingUserIdx);
+  t.deepEqual(response.body[0].studentNumbers, [studentNumber]);
 });
 
 test('apply to group', async t => {