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

[FIX] 습관 방 생성시, entry 추가 구현 누락 #41

Merged
merged 3 commits into from
Jan 13, 2022
Merged

[FIX] 습관 방 생성시, entry 추가 구현 누락 #41

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
83ccfaa
style: api annotation location modify
youngkwon02 Jan 13, 2022
0a95457
fix: module export duplication
youngkwon02 Jan 13, 2022
add9530
feat: entry insertion when create a new room
youngkwon02 Jan 13, 2022
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
14 changes: 7 additions & 7 deletions functions/api/routes/room/roomCodeGET.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
const functions = require('firebase-functions');
const util = require('../../../lib/util');
const statusCode = require('../../../constants/statusCode');
const responseMessage = require('../../../constants/responseMessage');
const db = require('../../../db/db');
const { userDB, roomDB } = require('../../../db');

/**
* @코드로_대기_방_정보_확인
* @route GET /room/code/:code
Expand All @@ -9,13 +16,6 @@
* 5. 한번 내보내진 사용자인 경우
*/

const functions = require('firebase-functions');
const util = require('../../../lib/util');
const statusCode = require('../../../constants/statusCode');
const responseMessage = require('../../../constants/responseMessage');
const db = require('../../../db/db');
const { userDB, roomDB } = require('../../../db');

module.exports = async (req, res) => {
const { code } = req.params;
const user = req.user;
Expand Down
33 changes: 15 additions & 18 deletions functions/api/routes/room/roomPOST.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,3 @@
/**
* @습관방_생성
* @route POST /room
* @body roomName:string, fromStart:boolean
* @error
* 1. 습관방 이름 / 습관방 타입이 전달되지 않음
*/

const functions = require('firebase-functions');
const util = require('../../../lib/util');
const statusCode = require('../../../constants/statusCode');
Expand All @@ -14,9 +6,18 @@ const db = require('../../../db/db');
const { roomDB } = require('../../../db');
const { nanoid } = require('nanoid');

/**
* @습관방_생성
* @route POST /room
* @body roomName:string, fromStart:boolean
* @error
* 1. 습관방 이름 / 습관방 타입이 전달되지 않음
*/

module.exports = async (req, res) => {
const { roomName, fromStart } = req.body;
const user = req.user;
const userId = user.userId;

console.log(roomName, fromStart);

Expand All @@ -25,7 +26,7 @@ module.exports = async (req, res) => {
return res.status(statusCode.BAD_REQUEST).send(util.fail(statusCode.BAD_REQUEST, responseMessage.NULL_VALUE));
}

let client, code, creatorId;
let client, code;
let isCodeUnique = false;

try {
Expand All @@ -35,17 +36,13 @@ module.exports = async (req, res) => {
isCodeUnique = await roomDB.isCodeUnique(client, code);
}

creatorId = user.userId;
// 습관 방 생성
const room = await roomDB.addRoom(client, roomName, code, userId, fromStart);

const room = await roomDB.addRoom(client, roomName, code, creatorId, fromStart);
let data = {
roomId: room.roomId,
roomName: room.roomName,
code: room.code,
};
console.log(room.roomId);
// 생성한 방에 입장
await roomDB.enterById(client, room.roomId, userId);

res.status(statusCode.OK).send(util.success(statusCode.OK, responseMessage.CREATE_ROOM_SUCCESS, data));
res.status(statusCode.OK).send(util.success(statusCode.OK, responseMessage.CREATE_ROOM_SUCCESS));
} catch (error) {
functions.logger.error(`[ERROR] [${req.method.toUpperCase()}] ${req.originalUrl}`, `[CONTENT] ${error}`);
console.log(error);
Expand Down
4 changes: 2 additions & 2 deletions functions/db/room.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ const getRecordsByDay = async (client, roomId, day) => {
AND r.day = $2
ORDER BY e.created_at
`,
[roomId,day]
[roomId, day],
);
return convertSnakeToCamel.keysToCamel(rows);
};
Expand Down Expand Up @@ -197,4 +197,4 @@ const enterById = async (client, roomId, userId) => {
}
};

module.exports = { addRoom, isCodeUnique, getRoomById, getRoomByCode, getRoomById, getEntriesByRoomId, kickedHistoryByIds, getEntryByIds, updatePurposeByEntryId, getRecordsByDay, checkEnteredById, enterById };
module.exports = { addRoom, isCodeUnique, getRoomById, getRoomByCode, getEntriesByRoomId, kickedHistoryByIds, getEntryByIds, updatePurposeByEntryId, getRecordsByDay, checkEnteredById, enterById };