Merge pull request #424 from connect-foundation/Develop

Week6 PR Develop to master

Author: teihong93

README.md

@@ -35,11 +35,6 @@
    - Host는 투표를 생성하여 Guest들에게 실시간 투표 참여를 요청할 수 있음
    - Guest들은 투표를 할 수 있고, 투표 상황은 실시간 공유됨
 
-## start local dev mode
-```sh
-yarn start
-```
-
 ## 위키 링크
 
 [wiki](https://github.com/connect-foundation/2019-21/wiki)

backend/.env.example

@@ -1,4 +1,6 @@
+#######################################################################################################################
 # MYSQL dev docker args
+#
 MYSQL_DEV_CONTAINER_NAME=mysql_bagle_dev
 MYSQL_DEV_ROOT_PASSWORD=db_root_password
 MYSQL_DEV_USER=DB_user
@@ -7,7 +9,10 @@ MYSQL_DEV_PORT=3307
 MYSQL_DEV_HOST=127.0.0.1
 MYSQL_DEV_SCHEME=bagle_dev
 MYSQL_DEV_DIALECT=mysql
+#######################################################################################################################
 
+
+#######################################################################################################################
 # MYSQL test docker args
 MYSQL_TEST_CONTAINER_NAME=mysql_bagle_test
 MYSQL_TEST_ROOT_PASSWORD=db_root_password
@@ -17,7 +22,10 @@ MYSQL_TEST_PORT=3308
 MYSQL_TEST_HOST=127.0.0.1
 MYSQL_TEST_SCHEME=bagle_test
 MYSQL_TEST_DIALECT=mysql
+#######################################################################################################################
+
 
+#######################################################################################################################
 # MYSQL product(deploy) args
 MYSQL_PROD_CONTAINER_NAME=mysql_bagle
 MYSQL_PROD_ROOT_PASSWORD=db_root_password
@@ -27,14 +35,20 @@ MYSQL_PROD_PORT=3306
 MYSQL_PROD_HOST=127.0.0.1
 MYSQL_PROD_SCHEME=bagle
 MYSQL_PROD_DIALECT=mysql
+#######################################################################################################################
 
+
+#######################################################################################################################
 # docker volumn path
 # path is start from docker compose file path
 # ex) project_root_path/docker
 DOCKER_VOLUMNS_PATH=./volumes
 NODE_IMAGE_NAME=deploy:node
+#######################################################################################################################
+
 
-# express docker args
+#######################################################################################################################
+# express server setting
 EXPRESS_PROD_CONTAINER_NAME=express
 EXPRESS_DEV_CONTAINER_NAME=express_dev
 EXPRESS_TEST_CONTAINER_NAME=express_test
@@ -43,6 +57,26 @@ EXPRESS_DEV_PORT=3001
 EXPRESS_TEST_PORT=3002
 EXPRESS_PROD_PORT=3000
 
+EXPRESS_DEV_PUBLIC_PATH=./express/public
+EXPRESS_TEST_PUBLIC_PATH=./build/express/public
+EXPRESS_PROD_PUBLIC_PATH=./build/express/public
+
+# route
+MAIN_PAGE=http://localhost:5000/
+HOST_PAGE=http://localhost:5001/
+GUEST_PAGE=http://localhost:5002/
+
+DEV_MAIN_PAGE=http://localhost:5000/
+DEV_HOST_PAGE=http://localhost:5001/
+DEV_GUEST_PAGE=http://localhost:5002/
+
+PROD_MAIN_PAGE=http://www.vaagle.com/main-app/
+PROD_HOST_PAGE=http://www.vaagle.com/host-app/
+PROD_GUEST_PAGE=http://www.vaagle.com/guest-app/
+#######################################################################################################################
+
+
+######################################################################################################
 # socket.io server docker
 SOCKET_IO_SERVER_PROD_CONTAINER_NAME=socket.io
 SOCKET_IO_SERVER_DEV_CONTAINER_NAME=socket.io_dev
@@ -51,11 +85,10 @@ SOCKET_IO_SERVER_TEST_CONTAINER_NAME=socket.io_test
 SOCKET_IO_SERVER_DEV_PORT=4001
 SOCKET_IO_SERVER_TEST_PORT=4002
 SOCKET_IO_SERVER_PROD_PORT=4000
+#######################################################################################################################
 
-EXPRESS_DEV_PUBLIC_PATH=./express/public
-EXPRESS_TEST_PUBLIC_PATH=./build/express/public
-EXPRESS_PROD_PUBLIC_PATH=./build/express/public
 
+#######################################################################################################################
 #graphql yoga server
 GRAPHQL_YOGA_SERVER_DEV_PORT=8001
 GRAPHQL_YOGA_SERVER_TEST_PORT=8002
@@ -64,7 +97,10 @@ GRAPHQL_YOGA_SERVER_PROD_PORT=8000
 GRAPHQL_YOGA_SERVER_DEV_CONTAINER_NAME=graphQL_yoga_dev
 GRAPHQL_YOGA_SERVER_TEST_CONTAINER_NAME=graphQL_yoga_test
 GRAPHQL_YOGA_SERVER_PROD_CONTAINER_NAME=graphQL_yoga
+#######################################################################################################################
+
 
+#######################################################################################################################
 #Oauth DEV config
 OAUTH2_CLIENT_DEV_ID=
 OAUTH2_CLIENT_DEV_SECRET=
@@ -80,16 +116,16 @@ OAUTH2_PROD_CALLBACK=
 AUTH_PROD_TOKEN_SECRET=
 AUTH_PROD_TOKEN_ISSUER=
 AUTH_PROD_TOKEN_AUDIENCE=
+#######################################################################################################################
 
-#route
-MAIN_PAGE=http://localhost:5000/
-HOST_PAGE=http://localhost:5001/
-GUEST_PAGE=http://localhost:5002/
 
-DEV_MAIN_PAGE=http://localhost:5000/
-DEV_HOST_PAGE=http://localhost:5001/
-DEV_GUEST_PAGE=http://localhost:5002/
+#######################################################################################################################
+# redis
+REDIS_DEV_CONTAINER_NAME=redis_dev
+REDIS_DEV_PORT=6379
+REDIS_DEV_HOST=127.0.0.1
 
-PROD_MAIN_PAGE=http://www.vaagle.com/main-app/
-PROD_HOST_PAGE=http://www.vaagle.com/host-app/
-PROD_GUEST_PAGE=http://www.vaagle.com/guest-app/
+REDIS_PROD_CONTAINER_NAME=redis_dev
+REDIS_PROD_PORT=6379
+REDIS_PROD_HOST=127.0.0.1
+#######################################################################################################################

backend/.prettierrc

@@ -3,4 +3,4 @@ tabWidth: 4
 useTabs: true
 semi: true
 singleQuote: false
-bracketSpacing: true
+bracketSpacing: false

backend/DB/dummy/candidateDummies.js

@@ -1,7 +1,7 @@
 import faker from "faker";
 import config from "./initialConfig";
 
-const { INIT_SEED, POLL_NUM } = config;
+const {INIT_SEED, POLL_NUM} = config;
 
 faker.seed(INIT_SEED);
 
@@ -14,7 +14,7 @@ export default function makeCandidateDummy(number = POLL_NUM) {
 		// 0: N지선다(text), 1: N지선다(date), 2: 별점매기기
 		if (index % 3 === 0) {
 			const LIMIT =
-				numberOfCandidates[faker.random.number({ min: 0, max: 9 })];
+				numberOfCandidates[faker.random.number({min: 0, max: 9})];
 
 			for (
 				let candidateNumber = 0;
@@ -36,7 +36,7 @@ export default function makeCandidateDummy(number = POLL_NUM) {
 			}
 		} else if (index % 3 === 1) {
 			const LIMIT =
-				numberOfCandidates[faker.random.number({ min: 0, max: 9 })];
+				numberOfCandidates[faker.random.number({min: 0, max: 9})];
 
 			for (
 				let candidateNumber = 0;

backend/DB/dummy/emojiDummies.js

@@ -24,7 +24,7 @@ export default async function makeEmojiDummy(number = 500) {
 			name,
 			createdAt,
 			updatedAt,
-			EventId: res.dataValues.EventId
+			EventId: res.dataValues.EventId,
 		});
 	}
 	return bulkEmoji;

backend/DB/dummy/initialConfig.js

@@ -3,7 +3,7 @@ const EVENT_NUM = 5;
 const GUEST_NUM = 200;
 const POLL_NUM = 20;
 const CANDIDATE_NUM = 110; // 이 값은 자동생성되는 candidates의 예상 갯수보다 약간 작은 수임
-const VOTE_NUM = 1000;
+const VOTE_NUM = 100;
 
 const config = {
 	INIT_SEED,

backend/DB/dummy/pollDummies.js

@@ -1,7 +1,7 @@
 import faker from "faker";
 import config from "./initialConfig";
 
-const { INIT_SEED, EVENT_NUM, POLL_NUM } = config;
+const {INIT_SEED, EVENT_NUM, POLL_NUM} = config;
 
 faker.seed(INIT_SEED);
 
@@ -11,9 +11,10 @@ export default function makePollDummy(number = POLL_NUM) {
 	for (let i = 1; i <= number; ++i) {
 		const pollName = faker.lorem.sentence();
 		// 0: N지선다(text), 1: N지선다(date), 2: 별점매기기
-		let type = i % 3;
+		const type = i % 3;
 		let pollType;
 		let selectionType;
+
 		if (type === 0) {
 			pollType = "nItems";
 			selectionType = "text";
@@ -23,15 +24,17 @@ export default function makePollDummy(number = POLL_NUM) {
 		} else {
 			pollType = "rating";
 			// let number = faker.random.number({ min: 2, max: 10 });
-			let number = 10;
+			const number = 10;
+
 			selectionType = number.toString();
 		}
 
 		const allowDuplication = faker.random.boolean();
 		const state = "closed";
 		const createdAt = faker.date.past(1);
 		const updatedAt = createdAt;
-		const EventId = faker.random.number({ min: 1, max: EVENT_NUM });
+		const pollDate = createdAt;
+		const EventId = faker.random.number({min: 1, max: EVENT_NUM});
 
 		bulkPoll.push({
 			pollName,
@@ -42,6 +45,7 @@ export default function makePollDummy(number = POLL_NUM) {
 			createdAt,
 			updatedAt,
 			EventId,
+			pollDate,
 		});
 	}
 

backend/DB/dummy/questionDummies.js

@@ -1,10 +1,10 @@
 import faker from "faker";
 import config from "./initialConfig";
 
-import { getGuestById } from "../queries/guest.js";
+import {getGuestById} from "../queries/guest.js";
 
 export default async function makeQuestionDummy(number = 100) {
-	const { INIT_SEED, GUEST_NUM } = config;
+	const {INIT_SEED, GUEST_NUM} = config;
 
 	faker.seed(INIT_SEED);
 	const bulkQuestion = [];
@@ -14,7 +14,7 @@ export default async function makeQuestionDummy(number = 100) {
 		const createdAt = faker.date.past(1);
 		const updatedAt = createdAt;
 		const state = "active";
-		const GuestId = faker.random.number({ min: 1, max: GUEST_NUM });
+		const GuestId = faker.random.number({min: 1, max: GUEST_NUM});
 		// eslint-disable-next-line no-await-in-loop
 		const res = await getGuestById(GuestId);
 		const EventId = res.dataValues.EventId;

backend/DB/dummy/voteDummies.js

@@ -1,7 +1,7 @@
 import faker from "faker";
 import config from "./initialConfig";
 
-const { INIT_SEED, GUEST_NUM, VOTE_NUM, CANDIDATE_NUM } = config;
+const {INIT_SEED, GUEST_NUM, VOTE_NUM, CANDIDATE_NUM} = config;
 
 faker.seed(INIT_SEED);
 
@@ -11,10 +11,10 @@ export default function makeVoteDummy(number = VOTE_NUM) {
 	for (let i = 0; i < number; ++i) {
 		const createdAt = faker.date.past(1);
 		const updatedAt = createdAt;
-		const GuestId = faker.random.number({ min: 1, max: GUEST_NUM });
-		const CandidateId = faker.random.number({ min: 1, max: CANDIDATE_NUM });
+		const GuestId = faker.random.number({min: 1, max: GUEST_NUM});
+		const CandidateId = faker.random.number({min: 1, max: CANDIDATE_NUM});
 
-		bulkVoter.push({ createdAt, updatedAt, GuestId, CandidateId });
+		bulkVoter.push({createdAt, updatedAt, GuestId, CandidateId});
 	}
 
 	return bulkVoter;

backend/DB/migrations/20191112070328-create-poll.js

@@ -22,6 +22,9 @@ module.exports = {
 			state: {
 				type: Sequelize.STRING(10),
 			},
+			pollDate: {
+				type: Sequelize.DATE,
+			},
 			createdAt: {
 				allowNull: false,
 				type: Sequelize.DATE,

backend/DB/migrations/20191209794363-add-column-event.js

@@ -0,0 +1,16 @@
+module.exports = {
+	up: (queryInterface, Sequelize) =>
+		queryInterface.addColumn(
+			"Events", // name of Source model
+			"isLive", // name of the key we're adding
+			{
+				type: Sequelize.BOOLEAN,
+				defaultValue: false,
+			},
+		),
+	down: (queryInterface, Sequelize) =>
+		queryInterface.removeColumn(
+			"Events",
+			"isLive", // name of Source model
+		),
+};

backend/DB/models/event.js

@@ -18,6 +18,10 @@ module.exports = (sequelize, DataTypes) => {
 				type: DataTypes.BOOLEAN,
 				defaultValue: false,
 			},
+			isLive: {
+				type: DataTypes.BOOLEAN,
+				defaultValue: false,
+			},
 			replyOption: {
 				type: DataTypes.BOOLEAN,
 				defaultValue: false,

backend/DB/models/poll.js

@@ -23,6 +23,9 @@ module.exports = (sequelize, DataTypes) => {
 			state: {
 				type: DataTypes.STRING(10),
 			},
+			pollDate: {
+				type: DataTypes.DATE,
+			},
 			createdAt: {
 				allowNull: false,
 				type: DataTypes.DATE,
@@ -32,7 +35,7 @@ module.exports = (sequelize, DataTypes) => {
 				type: DataTypes.DATE,
 			},
 		},
-		{}
+		{},
 	);
 
 	Poll.associate = function(models) {

backend/DB/queries/candidate.js

@@ -1,5 +1,7 @@
 import models from "../models";
+
 const Sequelize = require("sequelize");
+
 const Op = Sequelize.Op;
 
 export async function getCandidatesByPollId(pollIdList) {

backend/DB/queries/emoji.js

@@ -3,11 +3,12 @@ import models from "../models";
 
 const Emoji = models.Emoji;
 
-export async function createEmoji({GuestId, QuestionId, name}) {
+export async function createEmoji({GuestId, QuestionId, name, EventId}) {
 	return Emoji.create({
 		GuestId,
 		QuestionId,
 		name,
+		EventId,
 	});
 }
 
@@ -31,7 +32,7 @@ export async function getEmojiCountBy({name, QuestionId}) {
 
 export async function getEmojiGroupByQuestionId({EventId}) {
 	return Emoji.findAll({
-		attributes: ["QuestionId", "name", [sequelize.fn("count", "id"), "count"]],
+		attributes: ["QuestionId", "name", [sequelize.fn("count", "id"), "count"], [sequelize.literal("MIN(createdAt)"), "createdAt"]],
 		where: {EventId},
 		group: ["QuestionId", "name"],
 		raw: true,