code
stringlengths 41
34.3k
| lang
stringclasses 8
values | review
stringlengths 1
4.74k
|
|---|---|---|
@@ -0,0 +1,125 @@
+import React, { Component } from 'react';
+import { withRouter } from 'react-router-dom';
+import { API } from '../../../config';
+import './Login.scss';
+
+class LoginYeseul extends Component {
+ constructor(props) {
+ super(props);
+ this.state = {
+ inputId: '',
+ inputPw: '',
+ loginMode: true,
+ };
+ }
+
+ handleInput = e => {
+ const { name, value } = e.target;
+ this.setState({ [name]: value });
+ };
+
+ convertMode = () => {
+ this.setState({
+ loginMode: !this.state.loginMode,
+ });
+ };
+
+ signIn = e => {
+ const { inputId, inputPw } = this.state;
+ e.preventDefault();
+ fetch(API.SIGN_IN, {
+ method: 'POST',
+ body: JSON.stringify({
+ email: inputId,
+ password: inputPw,
+ }),
+ })
+ .then(users => users.json())
+ .then(users => {
+ if (users.MESSAGE === 'SUCCESS') {
+ this.setState({
+ inputId: '',
+ inputPw: '',
+ });
+ localStorage.setItem('token', users.ACCESS_TOKEN);
+ this.props.history.push('/main-yeseul');
+ } else if (users.MESSAGE === 'INVALID_USER') {
+ const wantToSignUp = window.confirm(
+ '์๋ชป๋ ์ ๋ณด์
๋๋ค. ํ์๊ฐ์
ํ์๊ฒ ์ต๋๊น?'
+ );
+ wantToSignUp && this.convertMode();
+ }
+ });
+ };
+
+ signUp = e => {
+ const { inputId, inputPw } = this.state;
+ e.preventDefault();
+ fetch(API.SIGN_UP, {
+ method: 'POST',
+ body: JSON.stringify({
+ email: inputId,
+ password: inputPw,
+ }),
+ })
+ .then(users => users.json())
+ .then(users => {
+ if (users.MESSAGE === 'SUCCESS') {
+ this.setState({
+ inputId: '',
+ inputPw: '',
+ });
+ alert(`ํ์๊ฐ์
๋์์ต๋๋ค!๐ ๋ก๊ทธ์ธํด์ฃผ์ธ์`);
+ this.convertMode();
+ } else {
+ alert(users.MESSAGE);
+ }
+ });
+ };
+
+ render() {
+ const { inputId, inputPw, loginMode } = this.state;
+ const checkId = /^\w[\w\-.]*@\w+\.\w{2,}/;
+
+ return (
+ <main className="loginYeseul give-border">
+ <h1 className="logo">westagram</h1>
+ <form
+ className="login-form"
+ onSubmit={loginMode ? this.signIn : this.signUp}
+ >
+ <div className="login-form__input-box">
+ <input
+ type="text"
+ name="inputId"
+ placeholder="์ ํ๋ฒํธ, ์ฌ์ฉ์ ์ด๋ฆ ๋๋ ์ด๋ฉ์ผ"
+ value={inputId}
+ onChange={this.handleInput}
+ />
+ <input
+ type="password"
+ name="inputPw"
+ placeholder="๋น๋ฐ๋ฒํธ"
+ value={inputPw}
+ onChange={this.handleInput}
+ />
+ </div>
+ <button
+ type="submit"
+ disabled={!(checkId.test(inputId) && inputPw.length > 8)}
+ >
+ {loginMode ? '๋ก๊ทธ์ธ' : 'ํ์๊ฐ์
'}
+ </button>
+ </form>
+ <a
+ href="https://www.instagram.com/accounts/password/reset/"
+ className="find-pw"
+ >
+ ๋น๋ฐ๋ฒํธ๋ฅผ ์์ผ์
จ๋์?
+ </a>
+ </main>
+ );
+ }
+}
+
+export default withRouter(LoginYeseul); | JavaScript | checkId์ ๋ค์ด๊ฐ๋๋ฐ์ดํฐ๋ ์ด๋ค๊ฑธ ์๋ฏธํ๋๊ฑด๊ฐ์ฌ???? |
@@ -0,0 +1,125 @@
+import React, { Component } from 'react';
+import { withRouter } from 'react-router-dom';
+import { API } from '../../../config';
+import './Login.scss';
+
+class LoginYeseul extends Component {
+ constructor(props) {
+ super(props);
+ this.state = {
+ inputId: '',
+ inputPw: '',
+ loginMode: true,
+ };
+ }
+
+ handleInput = e => {
+ const { name, value } = e.target;
+ this.setState({ [name]: value });
+ };
+
+ convertMode = () => {
+ this.setState({
+ loginMode: !this.state.loginMode,
+ });
+ };
+
+ signIn = e => {
+ const { inputId, inputPw } = this.state;
+ e.preventDefault();
+ fetch(API.SIGN_IN, {
+ method: 'POST',
+ body: JSON.stringify({
+ email: inputId,
+ password: inputPw,
+ }),
+ })
+ .then(users => users.json())
+ .then(users => {
+ if (users.MESSAGE === 'SUCCESS') {
+ this.setState({
+ inputId: '',
+ inputPw: '',
+ });
+ localStorage.setItem('token', users.ACCESS_TOKEN);
+ this.props.history.push('/main-yeseul');
+ } else if (users.MESSAGE === 'INVALID_USER') {
+ const wantToSignUp = window.confirm(
+ '์๋ชป๋ ์ ๋ณด์
๋๋ค. ํ์๊ฐ์
ํ์๊ฒ ์ต๋๊น?'
+ );
+ wantToSignUp && this.convertMode();
+ }
+ });
+ };
+
+ signUp = e => {
+ const { inputId, inputPw } = this.state;
+ e.preventDefault();
+ fetch(API.SIGN_UP, {
+ method: 'POST',
+ body: JSON.stringify({
+ email: inputId,
+ password: inputPw,
+ }),
+ })
+ .then(users => users.json())
+ .then(users => {
+ if (users.MESSAGE === 'SUCCESS') {
+ this.setState({
+ inputId: '',
+ inputPw: '',
+ });
+ alert(`ํ์๊ฐ์
๋์์ต๋๋ค!๐ ๋ก๊ทธ์ธํด์ฃผ์ธ์`);
+ this.convertMode();
+ } else {
+ alert(users.MESSAGE);
+ }
+ });
+ };
+
+ render() {
+ const { inputId, inputPw, loginMode } = this.state;
+ const checkId = /^\w[\w\-.]*@\w+\.\w{2,}/;
+
+ return (
+ <main className="loginYeseul give-border">
+ <h1 className="logo">westagram</h1>
+ <form
+ className="login-form"
+ onSubmit={loginMode ? this.signIn : this.signUp}
+ >
+ <div className="login-form__input-box">
+ <input
+ type="text"
+ name="inputId"
+ placeholder="์ ํ๋ฒํธ, ์ฌ์ฉ์ ์ด๋ฆ ๋๋ ์ด๋ฉ์ผ"
+ value={inputId}
+ onChange={this.handleInput}
+ />
+ <input
+ type="password"
+ name="inputPw"
+ placeholder="๋น๋ฐ๋ฒํธ"
+ value={inputPw}
+ onChange={this.handleInput}
+ />
+ </div>
+ <button
+ type="submit"
+ disabled={!(checkId.test(inputId) && inputPw.length > 8)}
+ >
+ {loginMode ? '๋ก๊ทธ์ธ' : 'ํ์๊ฐ์
'}
+ </button>
+ </form>
+ <a
+ href="https://www.instagram.com/accounts/password/reset/"
+ className="find-pw"
+ >
+ ๋น๋ฐ๋ฒํธ๋ฅผ ์์ผ์
จ๋์?
+ </a>
+ </main>
+ );
+ }
+}
+
+export default withRouter(LoginYeseul); | JavaScript | > checkId์ ๋ค์ด๊ฐ๋๋ฐ์ดํฐ๋ ์ด๋ค๊ฑธ ์๋ฏธํ๋๊ฑด๊ฐ์ฌ????
์
๋ ฅํ ์์ด๋๊ฐ ์ด๋ฉ์ผ ํ์์ ๋ง๋์ง ์ฒดํฌํ๋ ์ ๊ทํํ์์ด์์! ๋ค์ด๋ฐ์ด ์ง๊ด์ ์ด์ง ์์๊ฐ์?? |
@@ -0,0 +1,83 @@
+@import '../../../../../Styles/common.scss';
+
+.navYeseul {
+ position: fixed;
+ top: 0;
+ left: 50%;
+ right: 0;
+ transform: translateX(-50%);
+ padding: 8px 0;
+ border-bottom: 1px solid $main-border;
+ background-color: #fff;
+ z-index: 9999;
+
+ .inner-nav {
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+ margin: 0 auto;
+ padding: 0 20px;
+ width: 100%;
+ max-width: 975px;
+ box-sizing: border-box;
+
+ h1 {
+ display: flex;
+ align-items: center;
+ margin: 0;
+ font-size: 28px;
+ color: $main-font;
+
+ button {
+ margin-right: 15px;
+ padding: 0 14px 0 0;
+ width: 22px;
+ height: 22px;
+ box-sizing: content-box;
+ border-right: 2px solid $main-font;
+
+ img {
+ margin: 0;
+ }
+ }
+ }
+
+ .nav__search {
+ display: flex;
+ align-items: center;
+ padding: 3px 10px 3px 26px;
+ width: 215px;
+ min-width: 125px;
+ height: 28px;
+ box-sizing: border-box;
+ border: 1px solid $main-border;
+ border-radius: 3px;
+ background-color: $bg-light-grey;
+
+ input {
+ height: 100%;
+ background-color: transparent;
+
+ &::placeholder {
+ text-align: center;
+ }
+ }
+ }
+
+ .nav__menu {
+ display: flex;
+
+ li {
+ margin-left: 22px;
+ width: 22px;
+ height: 22px;
+
+ .like-button {
+ padding: 0;
+ width: 22px;
+ height: 22px;
+ }
+ }
+ }
+ }
+} | Unknown | ์ค ๊ผผ๊ผผํ ๋ด์ฃผ์
จ๋ค์ ๊ฐ์ฌํฉ๋๋น :) ๊ณ ์น๋ฌ๊ฐ์ |
@@ -0,0 +1,125 @@
+import React, { Component } from 'react';
+import { withRouter } from 'react-router-dom';
+import { API } from '../../../config';
+import './Login.scss';
+
+class LoginYeseul extends Component {
+ constructor(props) {
+ super(props);
+ this.state = {
+ inputId: '',
+ inputPw: '',
+ loginMode: true,
+ };
+ }
+
+ handleInput = e => {
+ const { name, value } = e.target;
+ this.setState({ [name]: value });
+ };
+
+ convertMode = () => {
+ this.setState({
+ loginMode: !this.state.loginMode,
+ });
+ };
+
+ signIn = e => {
+ const { inputId, inputPw } = this.state;
+ e.preventDefault();
+ fetch(API.SIGN_IN, {
+ method: 'POST',
+ body: JSON.stringify({
+ email: inputId,
+ password: inputPw,
+ }),
+ })
+ .then(users => users.json())
+ .then(users => {
+ if (users.MESSAGE === 'SUCCESS') {
+ this.setState({
+ inputId: '',
+ inputPw: '',
+ });
+ localStorage.setItem('token', users.ACCESS_TOKEN);
+ this.props.history.push('/main-yeseul');
+ } else if (users.MESSAGE === 'INVALID_USER') {
+ const wantToSignUp = window.confirm(
+ '์๋ชป๋ ์ ๋ณด์
๋๋ค. ํ์๊ฐ์
ํ์๊ฒ ์ต๋๊น?'
+ );
+ wantToSignUp && this.convertMode();
+ }
+ });
+ };
+
+ signUp = e => {
+ const { inputId, inputPw } = this.state;
+ e.preventDefault();
+ fetch(API.SIGN_UP, {
+ method: 'POST',
+ body: JSON.stringify({
+ email: inputId,
+ password: inputPw,
+ }),
+ })
+ .then(users => users.json())
+ .then(users => {
+ if (users.MESSAGE === 'SUCCESS') {
+ this.setState({
+ inputId: '',
+ inputPw: '',
+ });
+ alert(`ํ์๊ฐ์
๋์์ต๋๋ค!๐ ๋ก๊ทธ์ธํด์ฃผ์ธ์`);
+ this.convertMode();
+ } else {
+ alert(users.MESSAGE);
+ }
+ });
+ };
+
+ render() {
+ const { inputId, inputPw, loginMode } = this.state;
+ const checkId = /^\w[\w\-.]*@\w+\.\w{2,}/;
+
+ return (
+ <main className="loginYeseul give-border">
+ <h1 className="logo">westagram</h1>
+ <form
+ className="login-form"
+ onSubmit={loginMode ? this.signIn : this.signUp}
+ >
+ <div className="login-form__input-box">
+ <input
+ type="text"
+ name="inputId"
+ placeholder="์ ํ๋ฒํธ, ์ฌ์ฉ์ ์ด๋ฆ ๋๋ ์ด๋ฉ์ผ"
+ value={inputId}
+ onChange={this.handleInput}
+ />
+ <input
+ type="password"
+ name="inputPw"
+ placeholder="๋น๋ฐ๋ฒํธ"
+ value={inputPw}
+ onChange={this.handleInput}
+ />
+ </div>
+ <button
+ type="submit"
+ disabled={!(checkId.test(inputId) && inputPw.length > 8)}
+ >
+ {loginMode ? '๋ก๊ทธ์ธ' : 'ํ์๊ฐ์
'}
+ </button>
+ </form>
+ <a
+ href="https://www.instagram.com/accounts/password/reset/"
+ className="find-pw"
+ >
+ ๋น๋ฐ๋ฒํธ๋ฅผ ์์ผ์
จ๋์?
+ </a>
+ </main>
+ );
+ }
+}
+
+export default withRouter(LoginYeseul); | JavaScript | (์๋ฃ์ผ๋ฉด ์ค๋ฅ๊ฐ ๋จ๋๋ผ๊ตฌ์..) |
@@ -0,0 +1,83 @@
+@import '../../../../../Styles/common.scss';
+
+.navYeseul {
+ position: fixed;
+ top: 0;
+ left: 50%;
+ right: 0;
+ transform: translateX(-50%);
+ padding: 8px 0;
+ border-bottom: 1px solid $main-border;
+ background-color: #fff;
+ z-index: 9999;
+
+ .inner-nav {
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+ margin: 0 auto;
+ padding: 0 20px;
+ width: 100%;
+ max-width: 975px;
+ box-sizing: border-box;
+
+ h1 {
+ display: flex;
+ align-items: center;
+ margin: 0;
+ font-size: 28px;
+ color: $main-font;
+
+ button {
+ margin-right: 15px;
+ padding: 0 14px 0 0;
+ width: 22px;
+ height: 22px;
+ box-sizing: content-box;
+ border-right: 2px solid $main-font;
+
+ img {
+ margin: 0;
+ }
+ }
+ }
+
+ .nav__search {
+ display: flex;
+ align-items: center;
+ padding: 3px 10px 3px 26px;
+ width: 215px;
+ min-width: 125px;
+ height: 28px;
+ box-sizing: border-box;
+ border: 1px solid $main-border;
+ border-radius: 3px;
+ background-color: $bg-light-grey;
+
+ input {
+ height: 100%;
+ background-color: transparent;
+
+ &::placeholder {
+ text-align: center;
+ }
+ }
+ }
+
+ .nav__menu {
+ display: flex;
+
+ li {
+ margin-left: 22px;
+ width: 22px;
+ height: 22px;
+
+ .like-button {
+ padding: 0;
+ width: 22px;
+ height: 22px;
+ }
+ }
+ }
+ }
+} | Unknown | ์ ์ common์ ์์ฃ ?!?! |
@@ -0,0 +1,125 @@
+import React, { Component } from 'react';
+import { withRouter } from 'react-router-dom';
+import { API } from '../../../config';
+import './Login.scss';
+
+class LoginYeseul extends Component {
+ constructor(props) {
+ super(props);
+ this.state = {
+ inputId: '',
+ inputPw: '',
+ loginMode: true,
+ };
+ }
+
+ handleInput = e => {
+ const { name, value } = e.target;
+ this.setState({ [name]: value });
+ };
+
+ convertMode = () => {
+ this.setState({
+ loginMode: !this.state.loginMode,
+ });
+ };
+
+ signIn = e => {
+ const { inputId, inputPw } = this.state;
+ e.preventDefault();
+ fetch(API.SIGN_IN, {
+ method: 'POST',
+ body: JSON.stringify({
+ email: inputId,
+ password: inputPw,
+ }),
+ })
+ .then(users => users.json())
+ .then(users => {
+ if (users.MESSAGE === 'SUCCESS') {
+ this.setState({
+ inputId: '',
+ inputPw: '',
+ });
+ localStorage.setItem('token', users.ACCESS_TOKEN);
+ this.props.history.push('/main-yeseul');
+ } else if (users.MESSAGE === 'INVALID_USER') {
+ const wantToSignUp = window.confirm(
+ '์๋ชป๋ ์ ๋ณด์
๋๋ค. ํ์๊ฐ์
ํ์๊ฒ ์ต๋๊น?'
+ );
+ wantToSignUp && this.convertMode();
+ }
+ });
+ };
+
+ signUp = e => {
+ const { inputId, inputPw } = this.state;
+ e.preventDefault();
+ fetch(API.SIGN_UP, {
+ method: 'POST',
+ body: JSON.stringify({
+ email: inputId,
+ password: inputPw,
+ }),
+ })
+ .then(users => users.json())
+ .then(users => {
+ if (users.MESSAGE === 'SUCCESS') {
+ this.setState({
+ inputId: '',
+ inputPw: '',
+ });
+ alert(`ํ์๊ฐ์
๋์์ต๋๋ค!๐ ๋ก๊ทธ์ธํด์ฃผ์ธ์`);
+ this.convertMode();
+ } else {
+ alert(users.MESSAGE);
+ }
+ });
+ };
+
+ render() {
+ const { inputId, inputPw, loginMode } = this.state;
+ const checkId = /^\w[\w\-.]*@\w+\.\w{2,}/;
+
+ return (
+ <main className="loginYeseul give-border">
+ <h1 className="logo">westagram</h1>
+ <form
+ className="login-form"
+ onSubmit={loginMode ? this.signIn : this.signUp}
+ >
+ <div className="login-form__input-box">
+ <input
+ type="text"
+ name="inputId"
+ placeholder="์ ํ๋ฒํธ, ์ฌ์ฉ์ ์ด๋ฆ ๋๋ ์ด๋ฉ์ผ"
+ value={inputId}
+ onChange={this.handleInput}
+ />
+ <input
+ type="password"
+ name="inputPw"
+ placeholder="๋น๋ฐ๋ฒํธ"
+ value={inputPw}
+ onChange={this.handleInput}
+ />
+ </div>
+ <button
+ type="submit"
+ disabled={!(checkId.test(inputId) && inputPw.length > 8)}
+ >
+ {loginMode ? '๋ก๊ทธ์ธ' : 'ํ์๊ฐ์
'}
+ </button>
+ </form>
+ <a
+ href="https://www.instagram.com/accounts/password/reset/"
+ className="find-pw"
+ >
+ ๋น๋ฐ๋ฒํธ๋ฅผ ์์ผ์
จ๋์?
+ </a>
+ </main>
+ );
+ }
+}
+
+export default withRouter(LoginYeseul); | JavaScript | ์๋์์ฌ ์ ๊ฐ ์๋ชฐ๋์ด์ ใ
ใ
ใ
ใ
์ํ์
จ์ด์!! |
@@ -0,0 +1,125 @@
+import React, { Component } from 'react';
+import { withRouter } from 'react-router-dom';
+import { API } from '../../../config';
+import './Login.scss';
+
+class LoginYeseul extends Component {
+ constructor(props) {
+ super(props);
+ this.state = {
+ inputId: '',
+ inputPw: '',
+ loginMode: true,
+ };
+ }
+
+ handleInput = e => {
+ const { name, value } = e.target;
+ this.setState({ [name]: value });
+ };
+
+ convertMode = () => {
+ this.setState({
+ loginMode: !this.state.loginMode,
+ });
+ };
+
+ signIn = e => {
+ const { inputId, inputPw } = this.state;
+ e.preventDefault();
+ fetch(API.SIGN_IN, {
+ method: 'POST',
+ body: JSON.stringify({
+ email: inputId,
+ password: inputPw,
+ }),
+ })
+ .then(users => users.json())
+ .then(users => {
+ if (users.MESSAGE === 'SUCCESS') {
+ this.setState({
+ inputId: '',
+ inputPw: '',
+ });
+ localStorage.setItem('token', users.ACCESS_TOKEN);
+ this.props.history.push('/main-yeseul');
+ } else if (users.MESSAGE === 'INVALID_USER') {
+ const wantToSignUp = window.confirm(
+ '์๋ชป๋ ์ ๋ณด์
๋๋ค. ํ์๊ฐ์
ํ์๊ฒ ์ต๋๊น?'
+ );
+ wantToSignUp && this.convertMode();
+ }
+ });
+ };
+
+ signUp = e => {
+ const { inputId, inputPw } = this.state;
+ e.preventDefault();
+ fetch(API.SIGN_UP, {
+ method: 'POST',
+ body: JSON.stringify({
+ email: inputId,
+ password: inputPw,
+ }),
+ })
+ .then(users => users.json())
+ .then(users => {
+ if (users.MESSAGE === 'SUCCESS') {
+ this.setState({
+ inputId: '',
+ inputPw: '',
+ });
+ alert(`ํ์๊ฐ์
๋์์ต๋๋ค!๐ ๋ก๊ทธ์ธํด์ฃผ์ธ์`);
+ this.convertMode();
+ } else {
+ alert(users.MESSAGE);
+ }
+ });
+ };
+
+ render() {
+ const { inputId, inputPw, loginMode } = this.state;
+ const checkId = /^\w[\w\-.]*@\w+\.\w{2,}/;
+
+ return (
+ <main className="loginYeseul give-border">
+ <h1 className="logo">westagram</h1>
+ <form
+ className="login-form"
+ onSubmit={loginMode ? this.signIn : this.signUp}
+ >
+ <div className="login-form__input-box">
+ <input
+ type="text"
+ name="inputId"
+ placeholder="์ ํ๋ฒํธ, ์ฌ์ฉ์ ์ด๋ฆ ๋๋ ์ด๋ฉ์ผ"
+ value={inputId}
+ onChange={this.handleInput}
+ />
+ <input
+ type="password"
+ name="inputPw"
+ placeholder="๋น๋ฐ๋ฒํธ"
+ value={inputPw}
+ onChange={this.handleInput}
+ />
+ </div>
+ <button
+ type="submit"
+ disabled={!(checkId.test(inputId) && inputPw.length > 8)}
+ >
+ {loginMode ? '๋ก๊ทธ์ธ' : 'ํ์๊ฐ์
'}
+ </button>
+ </form>
+ <a
+ href="https://www.instagram.com/accounts/password/reset/"
+ className="find-pw"
+ >
+ ๋น๋ฐ๋ฒํธ๋ฅผ ์์ผ์
จ๋์?
+ </a>
+ </main>
+ );
+ }
+}
+
+export default withRouter(LoginYeseul); | JavaScript | ์ ๋ ์ด๋ฒคํธ๋ฅผ ์ค input์ name attribute๋ฅผ ๋ถ์ฌํด์ handleInputId์ด๋ handleInputPw ํจ์๋ฅผ ํ๋๋ก ํฉ์ณค๋๋ฐ ์ฐธ๊ณ ํ์
์ ๋ฐ์ํด๋ ์ข์ ๊ฒ ๊ฐ์์ค!
handleInput = e => {
this.setState({
[e.target.name]: e.target.value,
});
}; |
@@ -0,0 +1,125 @@
+import React, { Component } from 'react';
+import { withRouter } from 'react-router-dom';
+import { API } from '../../../config';
+import './Login.scss';
+
+class LoginYeseul extends Component {
+ constructor(props) {
+ super(props);
+ this.state = {
+ inputId: '',
+ inputPw: '',
+ loginMode: true,
+ };
+ }
+
+ handleInput = e => {
+ const { name, value } = e.target;
+ this.setState({ [name]: value });
+ };
+
+ convertMode = () => {
+ this.setState({
+ loginMode: !this.state.loginMode,
+ });
+ };
+
+ signIn = e => {
+ const { inputId, inputPw } = this.state;
+ e.preventDefault();
+ fetch(API.SIGN_IN, {
+ method: 'POST',
+ body: JSON.stringify({
+ email: inputId,
+ password: inputPw,
+ }),
+ })
+ .then(users => users.json())
+ .then(users => {
+ if (users.MESSAGE === 'SUCCESS') {
+ this.setState({
+ inputId: '',
+ inputPw: '',
+ });
+ localStorage.setItem('token', users.ACCESS_TOKEN);
+ this.props.history.push('/main-yeseul');
+ } else if (users.MESSAGE === 'INVALID_USER') {
+ const wantToSignUp = window.confirm(
+ '์๋ชป๋ ์ ๋ณด์
๋๋ค. ํ์๊ฐ์
ํ์๊ฒ ์ต๋๊น?'
+ );
+ wantToSignUp && this.convertMode();
+ }
+ });
+ };
+
+ signUp = e => {
+ const { inputId, inputPw } = this.state;
+ e.preventDefault();
+ fetch(API.SIGN_UP, {
+ method: 'POST',
+ body: JSON.stringify({
+ email: inputId,
+ password: inputPw,
+ }),
+ })
+ .then(users => users.json())
+ .then(users => {
+ if (users.MESSAGE === 'SUCCESS') {
+ this.setState({
+ inputId: '',
+ inputPw: '',
+ });
+ alert(`ํ์๊ฐ์
๋์์ต๋๋ค!๐ ๋ก๊ทธ์ธํด์ฃผ์ธ์`);
+ this.convertMode();
+ } else {
+ alert(users.MESSAGE);
+ }
+ });
+ };
+
+ render() {
+ const { inputId, inputPw, loginMode } = this.state;
+ const checkId = /^\w[\w\-.]*@\w+\.\w{2,}/;
+
+ return (
+ <main className="loginYeseul give-border">
+ <h1 className="logo">westagram</h1>
+ <form
+ className="login-form"
+ onSubmit={loginMode ? this.signIn : this.signUp}
+ >
+ <div className="login-form__input-box">
+ <input
+ type="text"
+ name="inputId"
+ placeholder="์ ํ๋ฒํธ, ์ฌ์ฉ์ ์ด๋ฆ ๋๋ ์ด๋ฉ์ผ"
+ value={inputId}
+ onChange={this.handleInput}
+ />
+ <input
+ type="password"
+ name="inputPw"
+ placeholder="๋น๋ฐ๋ฒํธ"
+ value={inputPw}
+ onChange={this.handleInput}
+ />
+ </div>
+ <button
+ type="submit"
+ disabled={!(checkId.test(inputId) && inputPw.length > 8)}
+ >
+ {loginMode ? '๋ก๊ทธ์ธ' : 'ํ์๊ฐ์
'}
+ </button>
+ </form>
+ <a
+ href="https://www.instagram.com/accounts/password/reset/"
+ className="find-pw"
+ >
+ ๋น๋ฐ๋ฒํธ๋ฅผ ์์ผ์
จ๋์?
+ </a>
+ </main>
+ );
+ }
+}
+
+export default withRouter(LoginYeseul); | JavaScript | - API ๋ถ๋ ์ดํ์ src/config.js ํ์ผ์ ๋ง๋ค์ด ํด๋น ํ์ผ์์ ์ผ๊ด์ ์ผ๋ก ๊ด๋ฆฌํฉ๋๋ค.
```js
// config.js
const IP = '10.58.6.252:8000';
export const SIGN_IN_API = `http://${IP}/user/signin`;
// Login.js
import { SIGN_IN_API } from '../../config.js';
...
fetch(SIGN_IN_API).then().then()
...
```
- ์์ ๊ฐ์ด config.js ์์ ์ผ๊ด์ ์ผ๋ก ๊ด๋ฆฌํ ๊ฒฝ์ฐ, ๋ฐฑ์๋ ์๋ฒ์ IP ๊ฐ ๋ณ๊ฒฝ๋๊ฑฐ๋ ํน์ ์๋ํฌ์ธํธ๊ฐ ๋ณ๊ฒฝ๋์์ ๋, config.js ์์๋ง ํ๋ฒ ์์ ํด์ฃผ๋ฉด ๋๊ธฐ ๋๋ฌธ์ ์ ์ง๋ณด์๊ฐ ํธํด์ง๋๋ค. |
@@ -0,0 +1,125 @@
+import React, { Component } from 'react';
+import { withRouter } from 'react-router-dom';
+import { API } from '../../../config';
+import './Login.scss';
+
+class LoginYeseul extends Component {
+ constructor(props) {
+ super(props);
+ this.state = {
+ inputId: '',
+ inputPw: '',
+ loginMode: true,
+ };
+ }
+
+ handleInput = e => {
+ const { name, value } = e.target;
+ this.setState({ [name]: value });
+ };
+
+ convertMode = () => {
+ this.setState({
+ loginMode: !this.state.loginMode,
+ });
+ };
+
+ signIn = e => {
+ const { inputId, inputPw } = this.state;
+ e.preventDefault();
+ fetch(API.SIGN_IN, {
+ method: 'POST',
+ body: JSON.stringify({
+ email: inputId,
+ password: inputPw,
+ }),
+ })
+ .then(users => users.json())
+ .then(users => {
+ if (users.MESSAGE === 'SUCCESS') {
+ this.setState({
+ inputId: '',
+ inputPw: '',
+ });
+ localStorage.setItem('token', users.ACCESS_TOKEN);
+ this.props.history.push('/main-yeseul');
+ } else if (users.MESSAGE === 'INVALID_USER') {
+ const wantToSignUp = window.confirm(
+ '์๋ชป๋ ์ ๋ณด์
๋๋ค. ํ์๊ฐ์
ํ์๊ฒ ์ต๋๊น?'
+ );
+ wantToSignUp && this.convertMode();
+ }
+ });
+ };
+
+ signUp = e => {
+ const { inputId, inputPw } = this.state;
+ e.preventDefault();
+ fetch(API.SIGN_UP, {
+ method: 'POST',
+ body: JSON.stringify({
+ email: inputId,
+ password: inputPw,
+ }),
+ })
+ .then(users => users.json())
+ .then(users => {
+ if (users.MESSAGE === 'SUCCESS') {
+ this.setState({
+ inputId: '',
+ inputPw: '',
+ });
+ alert(`ํ์๊ฐ์
๋์์ต๋๋ค!๐ ๋ก๊ทธ์ธํด์ฃผ์ธ์`);
+ this.convertMode();
+ } else {
+ alert(users.MESSAGE);
+ }
+ });
+ };
+
+ render() {
+ const { inputId, inputPw, loginMode } = this.state;
+ const checkId = /^\w[\w\-.]*@\w+\.\w{2,}/;
+
+ return (
+ <main className="loginYeseul give-border">
+ <h1 className="logo">westagram</h1>
+ <form
+ className="login-form"
+ onSubmit={loginMode ? this.signIn : this.signUp}
+ >
+ <div className="login-form__input-box">
+ <input
+ type="text"
+ name="inputId"
+ placeholder="์ ํ๋ฒํธ, ์ฌ์ฉ์ ์ด๋ฆ ๋๋ ์ด๋ฉ์ผ"
+ value={inputId}
+ onChange={this.handleInput}
+ />
+ <input
+ type="password"
+ name="inputPw"
+ placeholder="๋น๋ฐ๋ฒํธ"
+ value={inputPw}
+ onChange={this.handleInput}
+ />
+ </div>
+ <button
+ type="submit"
+ disabled={!(checkId.test(inputId) && inputPw.length > 8)}
+ >
+ {loginMode ? '๋ก๊ทธ์ธ' : 'ํ์๊ฐ์
'}
+ </button>
+ </form>
+ <a
+ href="https://www.instagram.com/accounts/password/reset/"
+ className="find-pw"
+ >
+ ๋น๋ฐ๋ฒํธ๋ฅผ ์์ผ์
จ๋์?
+ </a>
+ </main>
+ );
+ }
+}
+
+export default withRouter(LoginYeseul); | JavaScript | - ์ ๊ท์ ๐ ๐ |
@@ -0,0 +1,125 @@
+import React, { Component } from 'react';
+import { withRouter } from 'react-router-dom';
+import { API } from '../../../config';
+import './Login.scss';
+
+class LoginYeseul extends Component {
+ constructor(props) {
+ super(props);
+ this.state = {
+ inputId: '',
+ inputPw: '',
+ loginMode: true,
+ };
+ }
+
+ handleInput = e => {
+ const { name, value } = e.target;
+ this.setState({ [name]: value });
+ };
+
+ convertMode = () => {
+ this.setState({
+ loginMode: !this.state.loginMode,
+ });
+ };
+
+ signIn = e => {
+ const { inputId, inputPw } = this.state;
+ e.preventDefault();
+ fetch(API.SIGN_IN, {
+ method: 'POST',
+ body: JSON.stringify({
+ email: inputId,
+ password: inputPw,
+ }),
+ })
+ .then(users => users.json())
+ .then(users => {
+ if (users.MESSAGE === 'SUCCESS') {
+ this.setState({
+ inputId: '',
+ inputPw: '',
+ });
+ localStorage.setItem('token', users.ACCESS_TOKEN);
+ this.props.history.push('/main-yeseul');
+ } else if (users.MESSAGE === 'INVALID_USER') {
+ const wantToSignUp = window.confirm(
+ '์๋ชป๋ ์ ๋ณด์
๋๋ค. ํ์๊ฐ์
ํ์๊ฒ ์ต๋๊น?'
+ );
+ wantToSignUp && this.convertMode();
+ }
+ });
+ };
+
+ signUp = e => {
+ const { inputId, inputPw } = this.state;
+ e.preventDefault();
+ fetch(API.SIGN_UP, {
+ method: 'POST',
+ body: JSON.stringify({
+ email: inputId,
+ password: inputPw,
+ }),
+ })
+ .then(users => users.json())
+ .then(users => {
+ if (users.MESSAGE === 'SUCCESS') {
+ this.setState({
+ inputId: '',
+ inputPw: '',
+ });
+ alert(`ํ์๊ฐ์
๋์์ต๋๋ค!๐ ๋ก๊ทธ์ธํด์ฃผ์ธ์`);
+ this.convertMode();
+ } else {
+ alert(users.MESSAGE);
+ }
+ });
+ };
+
+ render() {
+ const { inputId, inputPw, loginMode } = this.state;
+ const checkId = /^\w[\w\-.]*@\w+\.\w{2,}/;
+
+ return (
+ <main className="loginYeseul give-border">
+ <h1 className="logo">westagram</h1>
+ <form
+ className="login-form"
+ onSubmit={loginMode ? this.signIn : this.signUp}
+ >
+ <div className="login-form__input-box">
+ <input
+ type="text"
+ name="inputId"
+ placeholder="์ ํ๋ฒํธ, ์ฌ์ฉ์ ์ด๋ฆ ๋๋ ์ด๋ฉ์ผ"
+ value={inputId}
+ onChange={this.handleInput}
+ />
+ <input
+ type="password"
+ name="inputPw"
+ placeholder="๋น๋ฐ๋ฒํธ"
+ value={inputPw}
+ onChange={this.handleInput}
+ />
+ </div>
+ <button
+ type="submit"
+ disabled={!(checkId.test(inputId) && inputPw.length > 8)}
+ >
+ {loginMode ? '๋ก๊ทธ์ธ' : 'ํ์๊ฐ์
'}
+ </button>
+ </form>
+ <a
+ href="https://www.instagram.com/accounts/password/reset/"
+ className="find-pw"
+ >
+ ๋น๋ฐ๋ฒํธ๋ฅผ ์์ผ์
จ๋์?
+ </a>
+ </main>
+ );
+ }
+}
+
+export default withRouter(LoginYeseul); | JavaScript | - ํด๋์ค ๋ค์ ๋ค์ด๋ฐ ๐ |
@@ -0,0 +1,60 @@
+@import '../../../Styles/common.scss';
+
+.loginYeseul {
+ position: fixed;
+ top: 50%;
+ left: 50%;
+ transform: translate(-50%, -60%);
+ padding: 32px 0 25px;
+ width: 350px;
+ text-align: center;
+
+ h1 {
+ font-size: 40px;
+ }
+
+ .login-form {
+ margin: 35px 40px 120px;
+
+ &__input-box {
+ margin-bottom: 15px;
+
+ input {
+ margin: 3px 0;
+ padding: 12px 10px 10px;
+ border: 1px solid $main-border;
+ border-radius: 3px;
+ background-color: $bg-light-grey;
+
+ &::placeholder,
+ &::-webkit-input-placeholder,
+ &::-ms-input-placeholder {
+ color: $font--grey;
+ }
+
+ &:focus {
+ border: 1px solid $border--gray;
+ }
+ }
+ }
+
+ button {
+ padding: 8px;
+ width: 100%;
+ border-radius: 4px;
+ background-color: $btn--blue;
+ color: #fff;
+ font-weight: 600;
+ }
+ }
+
+ .find-pw {
+ font-size: 13px;
+ }
+
+ button:disabled,
+ input:disabled {
+ opacity: 0.3;
+ pointer-events: none;
+ }
+} | Unknown | - & ์ฐ์ฐ์ ํ์ฉ ๊ตฟ์
๋๋ค! |
@@ -0,0 +1,55 @@
+import React, { Component } from 'react';
+import { Link } from 'react-router-dom';
+import './Comment.scss';
+
+class Comment extends Component {
+ constructor(props) {
+ super(props);
+ this.state = {
+ isLiked: false,
+ };
+ }
+
+ likeComment = () => {
+ this.setState({ isLiked: !this.state.isLiked });
+ };
+
+ render() {
+ const { isLiked } = this.state;
+ const { info, handleClick } = this.props;
+
+ return (
+ <p className="feed__comment align-item-center">
+ <span className="user-name">{info.writer}</span>
+ <Link to="/main-yeseul">{info.tagId ? `@${info.tagId}` : ''}</Link>
+ {info.content}
+ <button
+ type="button"
+ className="delete-btn"
+ onClick={() => handleClick(info.id)}
+ >
+ x
+ </button>
+ <button
+ className={
+ isLiked ? 'like-btn align-right clicked' : 'like-btn align-right '
+ }
+ onClick={this.likeComment}
+ >
+ <svg
+ version="1.1"
+ id="Capa_1"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlnsXlink="http://www.w3.org/1999/xlink"
+ viewBox="-50 -45 580 580"
+ xmlSpace="preserve"
+ >
+ <path d="M376,30c-27.783,0-53.255,8.804-75.707,26.168c-21.525,16.647-35.856,37.85-44.293,53.268c-8.437-15.419-22.768-36.621-44.293-53.268C189.255,38.804,163.783,30,136,30C58.468,30,0,93.417,0,177.514c0,90.854,72.943,153.015,183.369,247.118c18.752,15.981,40.007,34.095,62.099,53.414C248.38,480.596,252.12,482,256,482s7.62-1.404,10.532-3.953c22.094-19.322,43.348-37.435,62.111-53.425C439.057,330.529,512,268.368,512,177.514C512,93.417,453.532,30,376,30z" />
+ </svg>
+ </button>
+ </p>
+ );
+ }
+}
+
+export default Comment; | JavaScript | - id ๊ฐ์ ํ๋ก์ ํธ ์ ์ฒด ๋ด์์ ์ ์ผํด์ผํ๊ธฐ ๋๋ฌธ์, ๊ผญ ํ์ํ ๊ฒฝ์ฐ์๋ง ์ฌ์ฉํด์ฃผ์ธ์!
- id ๋์ ์ onClick ์ด๋ฒคํธ์ ๋ฐ๋ก ์ธ์๋ฅผ ๋๊ฒจ์ฃผ์ค ์๋ ์์ต๋๋ค. ์ฐธ๊ณ ํด์ฃผ์ธ์!
```js
onClick = {() => this.props.handleClick(info.id)}
``` |
@@ -0,0 +1,140 @@
+import React, { Component } from 'react';
+import { Link } from 'react-router-dom';
+import User from '../User/User';
+import Comment from '../Comment/Comment';
+import IconButton from '../Button/IconButton';
+import { API } from '../../../../../config';
+import './Feed.scss';
+
+class Feed extends Component {
+ constructor(props) {
+ super(props);
+ this.state = {
+ inputComment: '',
+ commentId: 0,
+ comments: [],
+ };
+ }
+
+ componentDidMount() {
+ const { feedId } = this.props;
+ fetch(API.COMMENT)
+ .then(comments => comments.json())
+ .then(comments => {
+ this.setState({
+ commentId: comments.length + 1,
+ comments: comments.filter(comment => comment.feedId === feedId),
+ });
+ });
+ }
+
+ handleInput = e => {
+ this.setState({ inputComment: e.target.value });
+ };
+
+ addComment = e => {
+ const { inputComment, commentId, comments } = this.state;
+
+ e.preventDefault();
+ this.setState({
+ inputComment: '',
+ commentId: commentId + 1,
+ comments: [
+ ...comments,
+ {
+ id: commentId.toString(),
+ writer: this.props.userName,
+ content: inputComment,
+ tagId: '',
+ },
+ ],
+ });
+ };
+
+ deleteComment = clickedId => {
+ const { comments } = this.state;
+ this.setState({
+ comments: comments.filter(comment => comment.id !== clickedId),
+ });
+ };
+
+ render() {
+ const { inputComment, comments } = this.state;
+ const { writer, contents } = this.props;
+
+ return (
+ <article className="feed give-border">
+ <header className="feed__header">
+ <User size="small" user={writer}>
+ <IconButton
+ className="feed__header__more-icon align-right"
+ info={{ name: '๋๋ณด๊ธฐ', fileName: 'more.svg' }}
+ />
+ </User>
+ </header>
+ <div className="feed__image">
+ <img
+ alt={`by ${writer.name} on ${contents.date}`}
+ src={contents.postedImage}
+ />
+ </div>
+ <div className="feed__btns">
+ <button type="button">
+ <img
+ alt="์ข์์"
+ src="https://s3.ap-northeast-2.amazonaws.com/cdn.wecode.co.kr/bearu/heart.png"
+ />
+ </button>
+ <IconButton info={{ name: '๋๊ธ', fileName: 'comment.svg' }} />
+ <IconButton info={{ name: '๊ณต์ ํ๊ธฐ', fileName: 'send.svg' }} />
+ <IconButton
+ className="align-right"
+ info={{ name: '๋ถ๋งํฌ', fileName: 'bookmark.svg' }}
+ />
+ </div>
+ <p className="feed__likes-number">
+ <Link to="/main-yeseul">{`์ข์์ ${contents.likesNum}๊ฐ`}</Link>
+ </p>
+ <div className="feed__description">
+ <p>
+ <span className="user-name">{writer.name}</span>
+ <span>{contents.description}</span>
+ </p>
+ </div>
+ <div className="feed__comments">
+ {comments.map(comment => (
+ <Comment
+ key={comment.id}
+ info={comment}
+ handleClick={this.deleteComment}
+ />
+ ))}
+ </div>
+ <form
+ className="feed__form align-item-center space-between"
+ name="commentForm"
+ >
+ <IconButton info={{ name: '์ด๋ชจํฐ์ฝ', fileName: 'emoticon.svg' }} />
+ <input
+ type="text"
+ placeholder="๋๊ธ ๋ฌ๊ธฐ..."
+ value={inputComment}
+ className="feed__input-comment"
+ name="inputComment"
+ onChange={this.handleInput}
+ />
+ <input
+ type="submit"
+ className="feed__submit-comment"
+ name="submitComment"
+ value="๊ฒ์"
+ disabled={!(inputComment.length > 0)}
+ onClick={this.addComment}
+ />
+ </form>
+ </article>
+ );
+ }
+}
+
+export default Feed; | JavaScript | - get ๋ฉ์๋๋ ๊ธฐ๋ณธ ๋ฉ์๋์ด๊ธฐ ๋๋ฌธ์ ์๋ตํด์ฃผ์ค ์ ์์ต๋๋ค.
```suggestion
fetch('/data/Yeseul/commentData.json')
``` |
@@ -0,0 +1,140 @@
+import React, { Component } from 'react';
+import { Link } from 'react-router-dom';
+import User from '../User/User';
+import Comment from '../Comment/Comment';
+import IconButton from '../Button/IconButton';
+import { API } from '../../../../../config';
+import './Feed.scss';
+
+class Feed extends Component {
+ constructor(props) {
+ super(props);
+ this.state = {
+ inputComment: '',
+ commentId: 0,
+ comments: [],
+ };
+ }
+
+ componentDidMount() {
+ const { feedId } = this.props;
+ fetch(API.COMMENT)
+ .then(comments => comments.json())
+ .then(comments => {
+ this.setState({
+ commentId: comments.length + 1,
+ comments: comments.filter(comment => comment.feedId === feedId),
+ });
+ });
+ }
+
+ handleInput = e => {
+ this.setState({ inputComment: e.target.value });
+ };
+
+ addComment = e => {
+ const { inputComment, commentId, comments } = this.state;
+
+ e.preventDefault();
+ this.setState({
+ inputComment: '',
+ commentId: commentId + 1,
+ comments: [
+ ...comments,
+ {
+ id: commentId.toString(),
+ writer: this.props.userName,
+ content: inputComment,
+ tagId: '',
+ },
+ ],
+ });
+ };
+
+ deleteComment = clickedId => {
+ const { comments } = this.state;
+ this.setState({
+ comments: comments.filter(comment => comment.id !== clickedId),
+ });
+ };
+
+ render() {
+ const { inputComment, comments } = this.state;
+ const { writer, contents } = this.props;
+
+ return (
+ <article className="feed give-border">
+ <header className="feed__header">
+ <User size="small" user={writer}>
+ <IconButton
+ className="feed__header__more-icon align-right"
+ info={{ name: '๋๋ณด๊ธฐ', fileName: 'more.svg' }}
+ />
+ </User>
+ </header>
+ <div className="feed__image">
+ <img
+ alt={`by ${writer.name} on ${contents.date}`}
+ src={contents.postedImage}
+ />
+ </div>
+ <div className="feed__btns">
+ <button type="button">
+ <img
+ alt="์ข์์"
+ src="https://s3.ap-northeast-2.amazonaws.com/cdn.wecode.co.kr/bearu/heart.png"
+ />
+ </button>
+ <IconButton info={{ name: '๋๊ธ', fileName: 'comment.svg' }} />
+ <IconButton info={{ name: '๊ณต์ ํ๊ธฐ', fileName: 'send.svg' }} />
+ <IconButton
+ className="align-right"
+ info={{ name: '๋ถ๋งํฌ', fileName: 'bookmark.svg' }}
+ />
+ </div>
+ <p className="feed__likes-number">
+ <Link to="/main-yeseul">{`์ข์์ ${contents.likesNum}๊ฐ`}</Link>
+ </p>
+ <div className="feed__description">
+ <p>
+ <span className="user-name">{writer.name}</span>
+ <span>{contents.description}</span>
+ </p>
+ </div>
+ <div className="feed__comments">
+ {comments.map(comment => (
+ <Comment
+ key={comment.id}
+ info={comment}
+ handleClick={this.deleteComment}
+ />
+ ))}
+ </div>
+ <form
+ className="feed__form align-item-center space-between"
+ name="commentForm"
+ >
+ <IconButton info={{ name: '์ด๋ชจํฐ์ฝ', fileName: 'emoticon.svg' }} />
+ <input
+ type="text"
+ placeholder="๋๊ธ ๋ฌ๊ธฐ..."
+ value={inputComment}
+ className="feed__input-comment"
+ name="inputComment"
+ onChange={this.handleInput}
+ />
+ <input
+ type="submit"
+ className="feed__submit-comment"
+ name="submitComment"
+ value="๊ฒ์"
+ disabled={!(inputComment.length > 0)}
+ onClick={this.addComment}
+ />
+ </form>
+ </article>
+ );
+ }
+}
+
+export default Feed; | JavaScript | - ๋ถ๋ณ์ฑ ์ ์ง์ผ์ฃผ์
จ๋ค์! ๐ ๐ |
@@ -0,0 +1,140 @@
+import React, { Component } from 'react';
+import { Link } from 'react-router-dom';
+import User from '../User/User';
+import Comment from '../Comment/Comment';
+import IconButton from '../Button/IconButton';
+import { API } from '../../../../../config';
+import './Feed.scss';
+
+class Feed extends Component {
+ constructor(props) {
+ super(props);
+ this.state = {
+ inputComment: '',
+ commentId: 0,
+ comments: [],
+ };
+ }
+
+ componentDidMount() {
+ const { feedId } = this.props;
+ fetch(API.COMMENT)
+ .then(comments => comments.json())
+ .then(comments => {
+ this.setState({
+ commentId: comments.length + 1,
+ comments: comments.filter(comment => comment.feedId === feedId),
+ });
+ });
+ }
+
+ handleInput = e => {
+ this.setState({ inputComment: e.target.value });
+ };
+
+ addComment = e => {
+ const { inputComment, commentId, comments } = this.state;
+
+ e.preventDefault();
+ this.setState({
+ inputComment: '',
+ commentId: commentId + 1,
+ comments: [
+ ...comments,
+ {
+ id: commentId.toString(),
+ writer: this.props.userName,
+ content: inputComment,
+ tagId: '',
+ },
+ ],
+ });
+ };
+
+ deleteComment = clickedId => {
+ const { comments } = this.state;
+ this.setState({
+ comments: comments.filter(comment => comment.id !== clickedId),
+ });
+ };
+
+ render() {
+ const { inputComment, comments } = this.state;
+ const { writer, contents } = this.props;
+
+ return (
+ <article className="feed give-border">
+ <header className="feed__header">
+ <User size="small" user={writer}>
+ <IconButton
+ className="feed__header__more-icon align-right"
+ info={{ name: '๋๋ณด๊ธฐ', fileName: 'more.svg' }}
+ />
+ </User>
+ </header>
+ <div className="feed__image">
+ <img
+ alt={`by ${writer.name} on ${contents.date}`}
+ src={contents.postedImage}
+ />
+ </div>
+ <div className="feed__btns">
+ <button type="button">
+ <img
+ alt="์ข์์"
+ src="https://s3.ap-northeast-2.amazonaws.com/cdn.wecode.co.kr/bearu/heart.png"
+ />
+ </button>
+ <IconButton info={{ name: '๋๊ธ', fileName: 'comment.svg' }} />
+ <IconButton info={{ name: '๊ณต์ ํ๊ธฐ', fileName: 'send.svg' }} />
+ <IconButton
+ className="align-right"
+ info={{ name: '๋ถ๋งํฌ', fileName: 'bookmark.svg' }}
+ />
+ </div>
+ <p className="feed__likes-number">
+ <Link to="/main-yeseul">{`์ข์์ ${contents.likesNum}๊ฐ`}</Link>
+ </p>
+ <div className="feed__description">
+ <p>
+ <span className="user-name">{writer.name}</span>
+ <span>{contents.description}</span>
+ </p>
+ </div>
+ <div className="feed__comments">
+ {comments.map(comment => (
+ <Comment
+ key={comment.id}
+ info={comment}
+ handleClick={this.deleteComment}
+ />
+ ))}
+ </div>
+ <form
+ className="feed__form align-item-center space-between"
+ name="commentForm"
+ >
+ <IconButton info={{ name: '์ด๋ชจํฐ์ฝ', fileName: 'emoticon.svg' }} />
+ <input
+ type="text"
+ placeholder="๋๊ธ ๋ฌ๊ธฐ..."
+ value={inputComment}
+ className="feed__input-comment"
+ name="inputComment"
+ onChange={this.handleInput}
+ />
+ <input
+ type="submit"
+ className="feed__submit-comment"
+ name="submitComment"
+ value="๊ฒ์"
+ disabled={!(inputComment.length > 0)}
+ onClick={this.addComment}
+ />
+ </form>
+ </article>
+ );
+ }
+}
+
+export default Feed; | JavaScript | - setState ๊ฐ ๊ธฐ์กด์ state ๊ฐ์ **๋ณํฉ** ํ๋ ์คํผ๋ ์ด์
์ด๊ธฐ ๋๋ฌธ์, ...this.state ๋ฅผ ํด์ฃผ์ค ํ์๊ฐ ์์ต๋๋ค.
```suggestion
this.setState({
comments: comments.filter(comment => comment.id !== clickedId),
});
``` |
@@ -0,0 +1,14 @@
+const flowTypeDao = require('../models/flowTypeDao');
+const error = require('../utils/error');
+
+const getFlowTypes = async () => {
+ const flowTypes = await flowTypeDao.getFlowTypes();
+ if (flowTypes.length === 0) {
+ error.throwErr(404, 'NOT_FOUND_TYPE');
+ }
+ return flowTypes;
+}
+
+module.exports = {
+ getFlowTypes
+}
\ No newline at end of file | JavaScript | ```suggestion
return flowTypes;
}
```
else ์์ด๋ ๋ ๊ฒ ๊ฐ์ต๋๋ค :) |
@@ -2,12 +2,11 @@ import styled from '@emotion/styled';
import { useRouter } from 'next/router';
import React, { useCallback, useMemo } from 'react';
import { FieldValues } from 'react-hook-form';
-import { useMutation } from 'react-query';
import { useRecoilValue } from 'recoil';
import { useGetFlavors } from '@/apis/flavors';
-import { ICreateReviewPayload, postReview } from '@/apis/review';
-import { uploadImage } from '@/apis/upload/uploadImage';
+import { ICreateReviewPayload, useCreateReviewMutation } from '@/apis/review';
+import { useUploadImageMutation } from '@/apis/upload/uploadImage';
import BottomFloatingButtonArea from '@/components/BottomFloatingButtonArea';
import { BOTTOM_FLOATING_BUTTON_AREA_HEIGHT } from '@/components/BottomFloatingButtonArea/BottomFloatingButtonArea';
import Button, { ButtonCount } from '@/components/Button';
@@ -39,8 +38,8 @@ const ReviewDetailContainer: React.FC<RecordThirdStepContainerProps> = ({
const router = useRouter();
const reviewForm = useRecoilValue($reviewForm);
const { data: flavors } = useGetFlavors();
- const { mutateAsync: uploadImageMutation } = useMutation(uploadImage);
- const { mutateAsync: createReviewMutation } = useMutation(postReview);
+ const { uploadImage } = useUploadImageMutation();
+ const { createReview } = useCreateReviewMutation();
// const { mutateAsync: updateRecordMutation } = useMutation(updateRecord, {
// onSuccess: () => {
// router.back();
@@ -60,25 +59,25 @@ const ReviewDetailContainer: React.FC<RecordThirdStepContainerProps> = ({
const handleImageUpload = useCallback(
async (image: FormData) => {
- const { imageUrl } = await uploadImageMutation(image);
+ const { imageUrl } = await uploadImage(image);
return imageUrl;
},
- [uploadImageMutation],
+ [uploadImage],
);
const handleCreateSubmit = useCallback(
(data: FieldValues) => {
- createReviewMutation(
+ createReview(
{
...reviewForm,
...data,
- beerId: beer.id,
+ beerId: beer?.id,
} as ICreateReviewPayload,
{ onSuccess: (_data) => router.push(`/record/ticket/${_data.id}?type=${NEW_TYPE}`) },
);
},
- [createReviewMutation, reviewForm, beer.id, router],
+ [createReview, reviewForm, beer?.id, router],
);
// const handleUpdateSubmit = useCallback(
@@ -112,7 +111,7 @@ const ReviewDetailContainer: React.FC<RecordThirdStepContainerProps> = ({
>
<StyledWrapper>
<h2>{'๋น์ ๋ง์ ๋งฅ์ฃผ ์ด์ผ๊ธฐ๋ ๋ค๋ ค์ฃผ์ธ์'}</h2>
- <p className="body-1">{beer.korName}</p>
+ <p className="body-1">{beer?.korName}</p>
<ImageUploadField
name="imageUrl"
beer={beer} | Unknown | @hy57in
mutation๋ ํ ๋ฒ ๋ํํด์ ์ฌ์ฉํ๋๊ฑด ์ด๋ ์ ๊ฐ์?
```typescript
export const useCreateReviewMutation = () => {
const cache = useQueryClient();
const { mutateAsync: createReviewMutation, ...rest } = useMutation(createReview, {
onSuccess: async () => {
await cache.invalidateQueries(queryKeyFactory.GET_REVIEW);
},
});
return {
createReview: createReviewMutation,
...rest,
};
};
``` |
@@ -2,12 +2,11 @@ import styled from '@emotion/styled';
import { useRouter } from 'next/router';
import React, { useCallback, useMemo } from 'react';
import { FieldValues } from 'react-hook-form';
-import { useMutation } from 'react-query';
import { useRecoilValue } from 'recoil';
import { useGetFlavors } from '@/apis/flavors';
-import { ICreateReviewPayload, postReview } from '@/apis/review';
-import { uploadImage } from '@/apis/upload/uploadImage';
+import { ICreateReviewPayload, useCreateReviewMutation } from '@/apis/review';
+import { useUploadImageMutation } from '@/apis/upload/uploadImage';
import BottomFloatingButtonArea from '@/components/BottomFloatingButtonArea';
import { BOTTOM_FLOATING_BUTTON_AREA_HEIGHT } from '@/components/BottomFloatingButtonArea/BottomFloatingButtonArea';
import Button, { ButtonCount } from '@/components/Button';
@@ -39,8 +38,8 @@ const ReviewDetailContainer: React.FC<RecordThirdStepContainerProps> = ({
const router = useRouter();
const reviewForm = useRecoilValue($reviewForm);
const { data: flavors } = useGetFlavors();
- const { mutateAsync: uploadImageMutation } = useMutation(uploadImage);
- const { mutateAsync: createReviewMutation } = useMutation(postReview);
+ const { uploadImage } = useUploadImageMutation();
+ const { createReview } = useCreateReviewMutation();
// const { mutateAsync: updateRecordMutation } = useMutation(updateRecord, {
// onSuccess: () => {
// router.back();
@@ -60,25 +59,25 @@ const ReviewDetailContainer: React.FC<RecordThirdStepContainerProps> = ({
const handleImageUpload = useCallback(
async (image: FormData) => {
- const { imageUrl } = await uploadImageMutation(image);
+ const { imageUrl } = await uploadImage(image);
return imageUrl;
},
- [uploadImageMutation],
+ [uploadImage],
);
const handleCreateSubmit = useCallback(
(data: FieldValues) => {
- createReviewMutation(
+ createReview(
{
...reviewForm,
...data,
- beerId: beer.id,
+ beerId: beer?.id,
} as ICreateReviewPayload,
{ onSuccess: (_data) => router.push(`/record/ticket/${_data.id}?type=${NEW_TYPE}`) },
);
},
- [createReviewMutation, reviewForm, beer.id, router],
+ [createReview, reviewForm, beer?.id, router],
);
// const handleUpdateSubmit = useCallback(
@@ -112,7 +111,7 @@ const ReviewDetailContainer: React.FC<RecordThirdStepContainerProps> = ({
>
<StyledWrapper>
<h2>{'๋น์ ๋ง์ ๋งฅ์ฃผ ์ด์ผ๊ธฐ๋ ๋ค๋ ค์ฃผ์ธ์'}</h2>
- <p className="body-1">{beer.korName}</p>
+ <p className="body-1">{beer?.korName}</p>
<ImageUploadField
name="imageUrl"
beer={beer} | Unknown | @hy57in
`useGetReviewsByBeer` ๋ queryKey๋ฅผ queryKeyFactory์์ ๊ฐ์ ธ์ค๋ ๋ฐฉ์์ผ๋ก ๋ณ๊ฒฝํ๋๊ฑฐ ์ด๋จ๊น์!?
ref
- https://github.com/beerair/beerair-web/blob/8a3fb178139646a813eac410820e31846c3460c3/src/commons/queryKeyFactory.ts |
@@ -2,12 +2,11 @@ import styled from '@emotion/styled';
import { useRouter } from 'next/router';
import React, { useCallback, useMemo } from 'react';
import { FieldValues } from 'react-hook-form';
-import { useMutation } from 'react-query';
import { useRecoilValue } from 'recoil';
import { useGetFlavors } from '@/apis/flavors';
-import { ICreateReviewPayload, postReview } from '@/apis/review';
-import { uploadImage } from '@/apis/upload/uploadImage';
+import { ICreateReviewPayload, useCreateReviewMutation } from '@/apis/review';
+import { useUploadImageMutation } from '@/apis/upload/uploadImage';
import BottomFloatingButtonArea from '@/components/BottomFloatingButtonArea';
import { BOTTOM_FLOATING_BUTTON_AREA_HEIGHT } from '@/components/BottomFloatingButtonArea/BottomFloatingButtonArea';
import Button, { ButtonCount } from '@/components/Button';
@@ -39,8 +38,8 @@ const ReviewDetailContainer: React.FC<RecordThirdStepContainerProps> = ({
const router = useRouter();
const reviewForm = useRecoilValue($reviewForm);
const { data: flavors } = useGetFlavors();
- const { mutateAsync: uploadImageMutation } = useMutation(uploadImage);
- const { mutateAsync: createReviewMutation } = useMutation(postReview);
+ const { uploadImage } = useUploadImageMutation();
+ const { createReview } = useCreateReviewMutation();
// const { mutateAsync: updateRecordMutation } = useMutation(updateRecord, {
// onSuccess: () => {
// router.back();
@@ -60,25 +59,25 @@ const ReviewDetailContainer: React.FC<RecordThirdStepContainerProps> = ({
const handleImageUpload = useCallback(
async (image: FormData) => {
- const { imageUrl } = await uploadImageMutation(image);
+ const { imageUrl } = await uploadImage(image);
return imageUrl;
},
- [uploadImageMutation],
+ [uploadImage],
);
const handleCreateSubmit = useCallback(
(data: FieldValues) => {
- createReviewMutation(
+ createReview(
{
...reviewForm,
...data,
- beerId: beer.id,
+ beerId: beer?.id,
} as ICreateReviewPayload,
{ onSuccess: (_data) => router.push(`/record/ticket/${_data.id}?type=${NEW_TYPE}`) },
);
},
- [createReviewMutation, reviewForm, beer.id, router],
+ [createReview, reviewForm, beer?.id, router],
);
// const handleUpdateSubmit = useCallback(
@@ -112,7 +111,7 @@ const ReviewDetailContainer: React.FC<RecordThirdStepContainerProps> = ({
>
<StyledWrapper>
<h2>{'๋น์ ๋ง์ ๋งฅ์ฃผ ์ด์ผ๊ธฐ๋ ๋ค๋ ค์ฃผ์ธ์'}</h2>
- <p className="body-1">{beer.korName}</p>
+ <p className="body-1">{beer?.korName}</p>
<ImageUploadField
name="imageUrl"
beer={beer} | Unknown | [bf34ee2](https://github.com/beerair/beerair-web/pull/162/commits/bf34ee2ba98545a4e64603f0bdad6d5195f50a47)
๋ง๋ค์ด๋์ queryKeyFactory ๋ฅผ ์๊ณ ์์๋ค์. ํด๋น๋ถ๋ถ ์์ ํ์ต๋๋ค!
mutaion๋ ๋ํํด์ ์์ ํ์ต๋๋ค! |
@@ -0,0 +1,45 @@
+import { useMutation, useQueryClient } from 'react-query';
+
+import request from '@/commons/axios';
+import { queryKeyFactory } from '@/commons/queryKeyFactory';
+import { IBaseResponse, IReview } from '@/types';
+
+/**
+ * ๋ฆฌ๋ทฐ ๋ฑ๋ก
+ */
+
+export interface ICreateReviewResponseData extends IBaseResponse<IReview> {}
+
+export interface ICreateReviewPayload {
+ beerId: number;
+ content: string;
+ feelStatus: number;
+ imageUrl: string;
+ isPublic: boolean;
+ flavorIds: number[];
+}
+
+export const createReview = async (payload: ICreateReviewPayload) => {
+ const res = await request<ICreateReviewResponseData>({
+ method: 'post',
+ url: '/api/v1/reviews',
+ data: { payload },
+ });
+
+ return res.data;
+};
+
+export const useCreateReviewMutation = () => {
+ const cache = useQueryClient();
+
+ const { mutateAsync: createReviewMutation, ...rest } = useMutation(createReview, {
+ onSuccess: async () => {
+ await cache.invalidateQueries(queryKeyFactory.GET_REVIEW());
+ },
+ });
+
+ return {
+ createReview: createReviewMutation,
+ ...rest,
+ };
+}; | TypeScript | @hy57in
๋ฆฌ๋ทฐ ์์ฑ๋๊ณ ํธ์ถ๋๋ success ํจ์ ๋ด๋ถ์์๋ ๋ฆฌ๋ทฐ ๋ฆฌ์คํธ๋ฅผ invalidate ์์ผ์ผํ์ง ์๋์..? |
@@ -0,0 +1,45 @@
+import { useMutation, useQueryClient } from 'react-query';
+
+import request from '@/commons/axios';
+import { queryKeyFactory } from '@/commons/queryKeyFactory';
+import { IBaseResponse, IReview } from '@/types';
+
+/**
+ * ๋ฆฌ๋ทฐ ๋ฑ๋ก
+ */
+
+export interface ICreateReviewResponseData extends IBaseResponse<IReview> {}
+
+export interface ICreateReviewPayload {
+ beerId: number;
+ content: string;
+ feelStatus: number;
+ imageUrl: string;
+ isPublic: boolean;
+ flavorIds: number[];
+}
+
+export const createReview = async (payload: ICreateReviewPayload) => {
+ const res = await request<ICreateReviewResponseData>({
+ method: 'post',
+ url: '/api/v1/reviews',
+ data: { payload },
+ });
+
+ return res.data;
+};
+
+export const useCreateReviewMutation = () => {
+ const cache = useQueryClient();
+
+ const { mutateAsync: createReviewMutation, ...rest } = useMutation(createReview, {
+ onSuccess: async () => {
+ await cache.invalidateQueries(queryKeyFactory.GET_REVIEW());
+ },
+ });
+
+ return {
+ createReview: createReviewMutation,
+ ...rest,
+ };
+}; | TypeScript | ์ํซ..! ๋ฆฌ๋ทฐ ๋ฆฌ์คํธ๋ฅผ invalidate ํ๋ ๊ฒ์ผ๋ก ์์ ํ์ต๋๋ค. ๋ฆฌ๋ทฐ ๊ฐ์ฌํฉ๋๋ค ๐ซข |
@@ -97,12 +97,12 @@ const BeerTicketTitle: React.FC<BeerTicketTitleProps> = ({
{sliceAndUpperCase(beer?.country?.engName || 'non', 3)}
</span>
<div className="ticket-detail">
- {`${beer?.alcohol?.toFixed(1)}%`}
+ {beer?.alcohol ? `${beer.alcohol?.toFixed(1)}%` : '-'}
<span className="ticket-detail-split-dot">{'โข'}</span>
- {beer?.type?.korName}
+ {beer?.type?.korName ?? '-'}
</div>
</div>
- <span className="ticket-beer-name">{beer?.korName}</span>
+ <span className="ticket-beer-name">{beer?.korName ?? '-'}</span>
</StyledBeerTicketTitle>
);
}; | Unknown | '?' ์์ด๋ ๊ด์ฐฎ์ ๊ฒ ๊ฐ์์!
```suggestion
{beer?.alcohol ? `${beer.alcohol.toFixed(1)}%` : '-'}
``` |
@@ -0,0 +1,41 @@
+package nextstep.security.authorization.manager;
+
+import nextstep.security.authentication.Authentication;
+import nextstep.security.authorization.AuthorizationDecision;
+import nextstep.security.authorization.Secured;
+import org.aopalliance.intercept.MethodInvocation;
+import org.springframework.core.annotation.AnnotationUtils;
+
+import java.lang.reflect.Method;
+import java.util.Collection;
+import java.util.Set;
+
+public class SecuredAuthorizationManager implements AuthorizationManager<MethodInvocation> {
+
+ private final AuthorizationManager<Collection<String>> authorizationManager;
+
+ public SecuredAuthorizationManager() {
+ this.authorizationManager = new AuthoritiesAuthorizationManager();
+ }
+
+ @Override
+ public AuthorizationDecision check(Authentication authentication, MethodInvocation invocation) {
+ Method method = invocation.getMethod();
+ boolean isGranted = isGranted(authentication, method);
+
+ return new AuthorizationDecision(isGranted);
+ }
+
+ private boolean isGranted(Authentication authentication, Method method) {
+ return (authentication != null && checkAuthorization(authentication, method));
+ }
+
+ private boolean checkAuthorization(Authentication authentication, Method method) {
+ if (!method.isAnnotationPresent(Secured.class)) {
+ return false;
+ }
+
+ Secured secured = AnnotationUtils.findAnnotation(method, Secured.class);
+ return this.authorizationManager.check(authentication, Set.of(secured.value())).isGranted();
+ }
+} | Java | ```suggestion
if (authentication == null) {
return AuthorizationDecision.ACCESS_DENIED;
}
```
๊ถํ์ ๋ฐ๋ฅธ ์์ธ ์ฒ๋ฆฌ๋ Interceptor์ ์ญํ ๋ก ๋๊ฒจ์ฃผ๋ฉด ์ด๋จ๊น์? |
@@ -0,0 +1,28 @@
+package nextstep.security.authorization.manager;
+
+import jakarta.servlet.http.HttpServletRequest;
+import nextstep.security.authentication.Authentication;
+import nextstep.security.authorization.AuthorizationDecision;
+import nextstep.security.authorization.access.RequestMatcherEntry;
+
+import java.util.List;
+
+public class RequestMatcherDelegatingAuthorizationManager implements AuthorizationManager<HttpServletRequest> {
+
+ private final List<RequestMatcherEntry<AuthorizationManager<HttpServletRequest>>> mappings;
+
+ public RequestMatcherDelegatingAuthorizationManager(List<RequestMatcherEntry<AuthorizationManager<HttpServletRequest>>> mappings) {
+ this.mappings = mappings;
+ }
+
+ @Override
+ public AuthorizationDecision check(Authentication authentication, HttpServletRequest httpServletRequest) {
+ for (RequestMatcherEntry<AuthorizationManager<HttpServletRequest>> entry : mappings) {
+ if (entry.getMatcher().matches(httpServletRequest)) {
+ return entry.getManager().check(authentication, httpServletRequest);
+ }
+ }
+
+ return AuthorizationDecision.ACCESS_DENIED;
+ }
+} | Java | AuthorizationManager์ ๋ํ ์ถ์ํ๋ฅผ ์ ํด์ฃผ์
จ๋ค์ ๐ |
@@ -1,13 +1,23 @@
package nextstep.app;
+import jakarta.servlet.http.HttpServletRequest;
import nextstep.app.domain.Member;
import nextstep.app.domain.MemberRepository;
import nextstep.security.authentication.AuthenticationException;
import nextstep.security.authentication.BasicAuthenticationFilter;
import nextstep.security.authentication.UsernamePasswordAuthenticationFilter;
-import nextstep.security.authorization.CheckAuthenticationFilter;
-import nextstep.security.authorization.SecuredAspect;
+import nextstep.security.authorization.AuthorizationFilter;
import nextstep.security.authorization.SecuredMethodInterceptor;
+import nextstep.security.authorization.access.AnyRequestMatcher;
+import nextstep.security.authorization.access.MvcRequestMatcher;
+import nextstep.security.authorization.access.RequestMatcherEntry;
+import nextstep.security.authorization.manager.AuthenticatedAuthorizationManager;
+import nextstep.security.authorization.manager.DenyAllAuthorizationManager;
+import nextstep.security.authorization.manager.HasAuthorityAuthorizationManager;
+import nextstep.security.authorization.manager.AuthorizationManager;
+import nextstep.security.authorization.manager.PermitAllAuthorizationManager;
+import nextstep.security.authorization.manager.RequestMatcherDelegatingAuthorizationManager;
+import nextstep.security.authorization.manager.SecuredAuthorizationManager;
import nextstep.security.config.DefaultSecurityFilterChain;
import nextstep.security.config.DelegatingFilterProxy;
import nextstep.security.config.FilterChainProxy;
@@ -18,7 +28,9 @@
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.EnableAspectJAutoProxy;
+import org.springframework.http.HttpMethod;
+import java.util.ArrayList;
import java.util.List;
import java.util.Set;
@@ -42,23 +54,14 @@ public FilterChainProxy filterChainProxy(List<SecurityFilterChain> securityFilte
return new FilterChainProxy(securityFilterChains);
}
- @Bean
- public SecuredMethodInterceptor securedMethodInterceptor() {
- return new SecuredMethodInterceptor();
- }
-// @Bean
-// public SecuredAspect securedAspect() {
-// return new SecuredAspect();
-// }
-
@Bean
public SecurityFilterChain securityFilterChain() {
return new DefaultSecurityFilterChain(
List.of(
new SecurityContextHolderFilter(),
new UsernamePasswordAuthenticationFilter(userDetailsService()),
new BasicAuthenticationFilter(userDetailsService()),
- new CheckAuthenticationFilter()
+ new AuthorizationFilter(requestAuthorizationManager())
)
);
}
@@ -87,4 +90,35 @@ public Set<String> getAuthorities() {
};
};
}
+
+ @Bean
+ public SecuredMethodInterceptor securedMethodInterceptor() {
+ return new SecuredMethodInterceptor(
+ new SecuredAuthorizationManager()
+ );
+ }
+
+ @Bean
+ public RequestMatcherDelegatingAuthorizationManager requestAuthorizationManager() {
+ List<RequestMatcherEntry<AuthorizationManager<HttpServletRequest>>> mappings = new ArrayList<>();
+
+ mappings.add(new RequestMatcherEntry<>(
+ new MvcRequestMatcher(HttpMethod.GET, "/members/me"),
+ new AuthenticatedAuthorizationManager<>())
+ );
+ mappings.add(new RequestMatcherEntry<>(
+ new MvcRequestMatcher(HttpMethod.GET, "/members"),
+ new HasAuthorityAuthorizationManager<>("ADMIN"))
+ );
+ mappings.add(new RequestMatcherEntry<>(
+ new MvcRequestMatcher(HttpMethod.GET, "/search"),
+ new PermitAllAuthorizationManager<>())
+ );
+ mappings.add(new RequestMatcherEntry<>(
+ new AnyRequestMatcher(),
+ new DenyAllAuthorizationManager<>())
+ );
+
+ return new RequestMatcherDelegatingAuthorizationManager(mappings);
+ }
} | Java | `๊ทธ ์ธ ๋ชจ๋ ์์ฒญ์ ๊ถํ์ ์ ํํ๊ธฐ ์ํด DenyAllAuthorizationManager๋ก ์ฒ๋ฆฌ`
ํด๋น ์๊ตฌ์ฌํญ์ด ๋ฐ์ ์๋์ด ์๋ ๊ฒ ๊ฐ๋ค์! |
@@ -1,13 +1,23 @@
package nextstep.app;
+import jakarta.servlet.http.HttpServletRequest;
import nextstep.app.domain.Member;
import nextstep.app.domain.MemberRepository;
import nextstep.security.authentication.AuthenticationException;
import nextstep.security.authentication.BasicAuthenticationFilter;
import nextstep.security.authentication.UsernamePasswordAuthenticationFilter;
-import nextstep.security.authorization.CheckAuthenticationFilter;
-import nextstep.security.authorization.SecuredAspect;
+import nextstep.security.authorization.AuthorizationFilter;
import nextstep.security.authorization.SecuredMethodInterceptor;
+import nextstep.security.authorization.access.AnyRequestMatcher;
+import nextstep.security.authorization.access.MvcRequestMatcher;
+import nextstep.security.authorization.access.RequestMatcherEntry;
+import nextstep.security.authorization.manager.AuthenticatedAuthorizationManager;
+import nextstep.security.authorization.manager.DenyAllAuthorizationManager;
+import nextstep.security.authorization.manager.HasAuthorityAuthorizationManager;
+import nextstep.security.authorization.manager.AuthorizationManager;
+import nextstep.security.authorization.manager.PermitAllAuthorizationManager;
+import nextstep.security.authorization.manager.RequestMatcherDelegatingAuthorizationManager;
+import nextstep.security.authorization.manager.SecuredAuthorizationManager;
import nextstep.security.config.DefaultSecurityFilterChain;
import nextstep.security.config.DelegatingFilterProxy;
import nextstep.security.config.FilterChainProxy;
@@ -18,7 +28,9 @@
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.EnableAspectJAutoProxy;
+import org.springframework.http.HttpMethod;
+import java.util.ArrayList;
import java.util.List;
import java.util.Set;
@@ -42,23 +54,14 @@ public FilterChainProxy filterChainProxy(List<SecurityFilterChain> securityFilte
return new FilterChainProxy(securityFilterChains);
}
- @Bean
- public SecuredMethodInterceptor securedMethodInterceptor() {
- return new SecuredMethodInterceptor();
- }
-// @Bean
-// public SecuredAspect securedAspect() {
-// return new SecuredAspect();
-// }
-
@Bean
public SecurityFilterChain securityFilterChain() {
return new DefaultSecurityFilterChain(
List.of(
new SecurityContextHolderFilter(),
new UsernamePasswordAuthenticationFilter(userDetailsService()),
new BasicAuthenticationFilter(userDetailsService()),
- new CheckAuthenticationFilter()
+ new AuthorizationFilter(requestAuthorizationManager())
)
);
}
@@ -87,4 +90,35 @@ public Set<String> getAuthorities() {
};
};
}
+
+ @Bean
+ public SecuredMethodInterceptor securedMethodInterceptor() {
+ return new SecuredMethodInterceptor(
+ new SecuredAuthorizationManager()
+ );
+ }
+
+ @Bean
+ public RequestMatcherDelegatingAuthorizationManager requestAuthorizationManager() {
+ List<RequestMatcherEntry<AuthorizationManager<HttpServletRequest>>> mappings = new ArrayList<>();
+
+ mappings.add(new RequestMatcherEntry<>(
+ new MvcRequestMatcher(HttpMethod.GET, "/members/me"),
+ new AuthenticatedAuthorizationManager<>())
+ );
+ mappings.add(new RequestMatcherEntry<>(
+ new MvcRequestMatcher(HttpMethod.GET, "/members"),
+ new HasAuthorityAuthorizationManager<>("ADMIN"))
+ );
+ mappings.add(new RequestMatcherEntry<>(
+ new MvcRequestMatcher(HttpMethod.GET, "/search"),
+ new PermitAllAuthorizationManager<>())
+ );
+ mappings.add(new RequestMatcherEntry<>(
+ new AnyRequestMatcher(),
+ new DenyAllAuthorizationManager<>())
+ );
+
+ return new RequestMatcherDelegatingAuthorizationManager(mappings);
+ }
} | Java | ๋ช
ํํ ์ญํ ์ ๊ตฌ๋ถํ๊ธฐ ์ํด AuthenticatedAuthorizationManager์ HasAuthorityAuthorizationManager๋ฅผ ๋ถ๋ฆฌํด์ ๊ตฌํํด๋ด๋ ์ข๊ฒ ๋ค์! |
@@ -0,0 +1,41 @@
+package nextstep.security.authorization.manager;
+
+import nextstep.security.authentication.Authentication;
+import nextstep.security.authorization.AuthorizationDecision;
+import nextstep.security.authorization.Secured;
+import org.aopalliance.intercept.MethodInvocation;
+import org.springframework.core.annotation.AnnotationUtils;
+
+import java.lang.reflect.Method;
+import java.util.Collection;
+import java.util.Set;
+
+public class SecuredAuthorizationManager implements AuthorizationManager<MethodInvocation> {
+
+ private final AuthorizationManager<Collection<String>> authorizationManager;
+
+ public SecuredAuthorizationManager() {
+ this.authorizationManager = new AuthoritiesAuthorizationManager();
+ }
+
+ @Override
+ public AuthorizationDecision check(Authentication authentication, MethodInvocation invocation) {
+ Method method = invocation.getMethod();
+ boolean isGranted = isGranted(authentication, method);
+
+ return new AuthorizationDecision(isGranted);
+ }
+
+ private boolean isGranted(Authentication authentication, Method method) {
+ return (authentication != null && checkAuthorization(authentication, method));
+ }
+
+ private boolean checkAuthorization(Authentication authentication, Method method) {
+ if (!method.isAnnotationPresent(Secured.class)) {
+ return false;
+ }
+
+ Secured secured = AnnotationUtils.findAnnotation(method, Secured.class);
+ return this.authorizationManager.check(authentication, Set.of(secured.value())).isGranted();
+ }
+} | Java | ์์ธ ์ฑ
์์ Interceptor์์ ํ๋ ๊ฒ์ด ๋ง๋ ๊ฒ ๊ฐ์์ ์์ ํ์์ต๋๋ค ! |
@@ -1,13 +1,23 @@
package nextstep.app;
+import jakarta.servlet.http.HttpServletRequest;
import nextstep.app.domain.Member;
import nextstep.app.domain.MemberRepository;
import nextstep.security.authentication.AuthenticationException;
import nextstep.security.authentication.BasicAuthenticationFilter;
import nextstep.security.authentication.UsernamePasswordAuthenticationFilter;
-import nextstep.security.authorization.CheckAuthenticationFilter;
-import nextstep.security.authorization.SecuredAspect;
+import nextstep.security.authorization.AuthorizationFilter;
import nextstep.security.authorization.SecuredMethodInterceptor;
+import nextstep.security.authorization.access.AnyRequestMatcher;
+import nextstep.security.authorization.access.MvcRequestMatcher;
+import nextstep.security.authorization.access.RequestMatcherEntry;
+import nextstep.security.authorization.manager.AuthenticatedAuthorizationManager;
+import nextstep.security.authorization.manager.DenyAllAuthorizationManager;
+import nextstep.security.authorization.manager.HasAuthorityAuthorizationManager;
+import nextstep.security.authorization.manager.AuthorizationManager;
+import nextstep.security.authorization.manager.PermitAllAuthorizationManager;
+import nextstep.security.authorization.manager.RequestMatcherDelegatingAuthorizationManager;
+import nextstep.security.authorization.manager.SecuredAuthorizationManager;
import nextstep.security.config.DefaultSecurityFilterChain;
import nextstep.security.config.DelegatingFilterProxy;
import nextstep.security.config.FilterChainProxy;
@@ -18,7 +28,9 @@
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.EnableAspectJAutoProxy;
+import org.springframework.http.HttpMethod;
+import java.util.ArrayList;
import java.util.List;
import java.util.Set;
@@ -42,23 +54,14 @@ public FilterChainProxy filterChainProxy(List<SecurityFilterChain> securityFilte
return new FilterChainProxy(securityFilterChains);
}
- @Bean
- public SecuredMethodInterceptor securedMethodInterceptor() {
- return new SecuredMethodInterceptor();
- }
-// @Bean
-// public SecuredAspect securedAspect() {
-// return new SecuredAspect();
-// }
-
@Bean
public SecurityFilterChain securityFilterChain() {
return new DefaultSecurityFilterChain(
List.of(
new SecurityContextHolderFilter(),
new UsernamePasswordAuthenticationFilter(userDetailsService()),
new BasicAuthenticationFilter(userDetailsService()),
- new CheckAuthenticationFilter()
+ new AuthorizationFilter(requestAuthorizationManager())
)
);
}
@@ -87,4 +90,35 @@ public Set<String> getAuthorities() {
};
};
}
+
+ @Bean
+ public SecuredMethodInterceptor securedMethodInterceptor() {
+ return new SecuredMethodInterceptor(
+ new SecuredAuthorizationManager()
+ );
+ }
+
+ @Bean
+ public RequestMatcherDelegatingAuthorizationManager requestAuthorizationManager() {
+ List<RequestMatcherEntry<AuthorizationManager<HttpServletRequest>>> mappings = new ArrayList<>();
+
+ mappings.add(new RequestMatcherEntry<>(
+ new MvcRequestMatcher(HttpMethod.GET, "/members/me"),
+ new AuthenticatedAuthorizationManager<>())
+ );
+ mappings.add(new RequestMatcherEntry<>(
+ new MvcRequestMatcher(HttpMethod.GET, "/members"),
+ new HasAuthorityAuthorizationManager<>("ADMIN"))
+ );
+ mappings.add(new RequestMatcherEntry<>(
+ new MvcRequestMatcher(HttpMethod.GET, "/search"),
+ new PermitAllAuthorizationManager<>())
+ );
+ mappings.add(new RequestMatcherEntry<>(
+ new AnyRequestMatcher(),
+ new DenyAllAuthorizationManager<>())
+ );
+
+ return new RequestMatcherDelegatingAuthorizationManager(mappings);
+ }
} | Java | ์ ์ด๋ถ๋ถ์ ๋นผ๋จน์๊ตฐ์ ใ
ใ
ใ
permitAll()์ด ์๋๋ผ denyAll()๋ก ์ฒ๋ฆฌํ ๋ค, ํ
์คํธ ์ถ๊ฐํ๋๋ก ํ๊ฒ ์ต๋๋ค. |
@@ -1,13 +1,23 @@
package nextstep.app;
+import jakarta.servlet.http.HttpServletRequest;
import nextstep.app.domain.Member;
import nextstep.app.domain.MemberRepository;
import nextstep.security.authentication.AuthenticationException;
import nextstep.security.authentication.BasicAuthenticationFilter;
import nextstep.security.authentication.UsernamePasswordAuthenticationFilter;
-import nextstep.security.authorization.CheckAuthenticationFilter;
-import nextstep.security.authorization.SecuredAspect;
+import nextstep.security.authorization.AuthorizationFilter;
import nextstep.security.authorization.SecuredMethodInterceptor;
+import nextstep.security.authorization.access.AnyRequestMatcher;
+import nextstep.security.authorization.access.MvcRequestMatcher;
+import nextstep.security.authorization.access.RequestMatcherEntry;
+import nextstep.security.authorization.manager.AuthenticatedAuthorizationManager;
+import nextstep.security.authorization.manager.DenyAllAuthorizationManager;
+import nextstep.security.authorization.manager.HasAuthorityAuthorizationManager;
+import nextstep.security.authorization.manager.AuthorizationManager;
+import nextstep.security.authorization.manager.PermitAllAuthorizationManager;
+import nextstep.security.authorization.manager.RequestMatcherDelegatingAuthorizationManager;
+import nextstep.security.authorization.manager.SecuredAuthorizationManager;
import nextstep.security.config.DefaultSecurityFilterChain;
import nextstep.security.config.DelegatingFilterProxy;
import nextstep.security.config.FilterChainProxy;
@@ -18,7 +28,9 @@
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.EnableAspectJAutoProxy;
+import org.springframework.http.HttpMethod;
+import java.util.ArrayList;
import java.util.List;
import java.util.Set;
@@ -42,23 +54,14 @@ public FilterChainProxy filterChainProxy(List<SecurityFilterChain> securityFilte
return new FilterChainProxy(securityFilterChains);
}
- @Bean
- public SecuredMethodInterceptor securedMethodInterceptor() {
- return new SecuredMethodInterceptor();
- }
-// @Bean
-// public SecuredAspect securedAspect() {
-// return new SecuredAspect();
-// }
-
@Bean
public SecurityFilterChain securityFilterChain() {
return new DefaultSecurityFilterChain(
List.of(
new SecurityContextHolderFilter(),
new UsernamePasswordAuthenticationFilter(userDetailsService()),
new BasicAuthenticationFilter(userDetailsService()),
- new CheckAuthenticationFilter()
+ new AuthorizationFilter(requestAuthorizationManager())
)
);
}
@@ -87,4 +90,35 @@ public Set<String> getAuthorities() {
};
};
}
+
+ @Bean
+ public SecuredMethodInterceptor securedMethodInterceptor() {
+ return new SecuredMethodInterceptor(
+ new SecuredAuthorizationManager()
+ );
+ }
+
+ @Bean
+ public RequestMatcherDelegatingAuthorizationManager requestAuthorizationManager() {
+ List<RequestMatcherEntry<AuthorizationManager<HttpServletRequest>>> mappings = new ArrayList<>();
+
+ mappings.add(new RequestMatcherEntry<>(
+ new MvcRequestMatcher(HttpMethod.GET, "/members/me"),
+ new AuthenticatedAuthorizationManager<>())
+ );
+ mappings.add(new RequestMatcherEntry<>(
+ new MvcRequestMatcher(HttpMethod.GET, "/members"),
+ new HasAuthorityAuthorizationManager<>("ADMIN"))
+ );
+ mappings.add(new RequestMatcherEntry<>(
+ new MvcRequestMatcher(HttpMethod.GET, "/search"),
+ new PermitAllAuthorizationManager<>())
+ );
+ mappings.add(new RequestMatcherEntry<>(
+ new AnyRequestMatcher(),
+ new DenyAllAuthorizationManager<>())
+ );
+
+ return new RequestMatcherDelegatingAuthorizationManager(mappings);
+ }
} | Java | ์๋
ํ์ธ์ ์ฌ์ฐ๋ !
์ ๊ฐ ์ด๋ถ๋ถ ์ฝ๋ฉํธ๋ฅผ ์ ํํ๊ฒ ์ดํดํ์ง๋ ๋ชปํ ๊ฒ ๊ฐ์ต๋๋ค.
๊ธฐ์กด ์ ๊ฐ ๊ตฌํํ ๋ถ๋ถ์ AuthorityAuthorizationManager<T>์์ ์ฒ๋ฆฌํ ๊ถํ๋ค์ ๊ฐ์ง๊ณ ์๊ณ , AuthoritiesAuthorizationManager๋ ์ ๋ฌ๋ฐ์ Role๋ค๋ก ๊ฒ์ฌ๋ง ํ๋ ์ฑ
์์ ๊ฐ์ง๊ณ ์๋๋ฐ์.
HasAuthorityAuthorizationManager๋ผ๋ ๊ฒ์ delegateํ์ง ์๊ณ , ์ค์ค๋ก ์ฒ๋ฆฌํ ์ญํ ์ ์๊ณ ์๊ณ ์ฒ๋ฆฌํ๋ ๊ฐ์ฒด๋ฅผ ์๋ฏธํ์๋ ๊ฒ ๋ง์๊น์!? |
@@ -1,13 +1,23 @@
package nextstep.app;
+import jakarta.servlet.http.HttpServletRequest;
import nextstep.app.domain.Member;
import nextstep.app.domain.MemberRepository;
import nextstep.security.authentication.AuthenticationException;
import nextstep.security.authentication.BasicAuthenticationFilter;
import nextstep.security.authentication.UsernamePasswordAuthenticationFilter;
-import nextstep.security.authorization.CheckAuthenticationFilter;
-import nextstep.security.authorization.SecuredAspect;
+import nextstep.security.authorization.AuthorizationFilter;
import nextstep.security.authorization.SecuredMethodInterceptor;
+import nextstep.security.authorization.access.AnyRequestMatcher;
+import nextstep.security.authorization.access.MvcRequestMatcher;
+import nextstep.security.authorization.access.RequestMatcherEntry;
+import nextstep.security.authorization.manager.AuthenticatedAuthorizationManager;
+import nextstep.security.authorization.manager.DenyAllAuthorizationManager;
+import nextstep.security.authorization.manager.HasAuthorityAuthorizationManager;
+import nextstep.security.authorization.manager.AuthorizationManager;
+import nextstep.security.authorization.manager.PermitAllAuthorizationManager;
+import nextstep.security.authorization.manager.RequestMatcherDelegatingAuthorizationManager;
+import nextstep.security.authorization.manager.SecuredAuthorizationManager;
import nextstep.security.config.DefaultSecurityFilterChain;
import nextstep.security.config.DelegatingFilterProxy;
import nextstep.security.config.FilterChainProxy;
@@ -18,7 +28,9 @@
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.EnableAspectJAutoProxy;
+import org.springframework.http.HttpMethod;
+import java.util.ArrayList;
import java.util.List;
import java.util.Set;
@@ -42,23 +54,14 @@ public FilterChainProxy filterChainProxy(List<SecurityFilterChain> securityFilte
return new FilterChainProxy(securityFilterChains);
}
- @Bean
- public SecuredMethodInterceptor securedMethodInterceptor() {
- return new SecuredMethodInterceptor();
- }
-// @Bean
-// public SecuredAspect securedAspect() {
-// return new SecuredAspect();
-// }
-
@Bean
public SecurityFilterChain securityFilterChain() {
return new DefaultSecurityFilterChain(
List.of(
new SecurityContextHolderFilter(),
new UsernamePasswordAuthenticationFilter(userDetailsService()),
new BasicAuthenticationFilter(userDetailsService()),
- new CheckAuthenticationFilter()
+ new AuthorizationFilter(requestAuthorizationManager())
)
);
}
@@ -87,4 +90,35 @@ public Set<String> getAuthorities() {
};
};
}
+
+ @Bean
+ public SecuredMethodInterceptor securedMethodInterceptor() {
+ return new SecuredMethodInterceptor(
+ new SecuredAuthorizationManager()
+ );
+ }
+
+ @Bean
+ public RequestMatcherDelegatingAuthorizationManager requestAuthorizationManager() {
+ List<RequestMatcherEntry<AuthorizationManager<HttpServletRequest>>> mappings = new ArrayList<>();
+
+ mappings.add(new RequestMatcherEntry<>(
+ new MvcRequestMatcher(HttpMethod.GET, "/members/me"),
+ new AuthenticatedAuthorizationManager<>())
+ );
+ mappings.add(new RequestMatcherEntry<>(
+ new MvcRequestMatcher(HttpMethod.GET, "/members"),
+ new HasAuthorityAuthorizationManager<>("ADMIN"))
+ );
+ mappings.add(new RequestMatcherEntry<>(
+ new MvcRequestMatcher(HttpMethod.GET, "/search"),
+ new PermitAllAuthorizationManager<>())
+ );
+ mappings.add(new RequestMatcherEntry<>(
+ new AnyRequestMatcher(),
+ new DenyAllAuthorizationManager<>())
+ );
+
+ return new RequestMatcherDelegatingAuthorizationManager(mappings);
+ }
} | Java | ํด๋น ์ฝ๋ฉํธ๋ ํด๋น ๊ฐ์ฒด๊ฐ ํ๋์ ์ญํ ๋ง ๋ด๋นํ๋ฉด ๊ฐ๋
์ฑ์ด ๋ ์ข์์ง ๊ฒ ๊ฐ์ ๋จ๊ธด๊ฑด๋ฐ์.
์คํ๋ง ์ํ๋ฆฌํฐ๋ ์ฐฌํธ๋์ด ๊ตฌํํ์ ๋ฐฉ์์ฒ๋ผ ๋ถ๋ฆฌ๋์ด ์์ง ์์ ์ฝ๋๋ผ์ ๊ผญ ๋ฐ์ํ์ค ํ์๋ ์์ง๋ง..
์ ๊ฐ ๋ดค์ ๋ ์คํ๋ง ์ํ๋ฆฌํฐ๋ ์ญํ ์ ๊ตฌ๋ถํ๋ฉด ๋ ๊ฐ๋
์ฑ์ด ์ข์์ง ๊ฒ ๊ฐ์์ ใ
ใ
ํ ๋ฒ ๊ณ ๋ฏผํด๋ณด์๋ฉด ์ข์ ๊ฒ ๊ฐ์ ์ฝ๋ฉํธ๋ฅผ ๋จ๊ฒผ์ต๋๋ค~ |
@@ -0,0 +1,18 @@
+const categoryDao = require('../models/categoryDao');
+const error = require('../utils/error');
+
+const getCategory = async (type) => {
+ const categoryTypes = {
+ '์ง์ถ' : [1, 2, 3],
+ '์์
' : [4]
+ }
+
+ const categories = await categoryDao.getCategoriesByIds(categoryTypes[type]);
+ categories.map((category) => { category.type = type })
+
+ return categories;
+}
+
+module.exports = {
+ getCategory
+}
\ No newline at end of file | JavaScript | ```suggestion
const getCategory = async (type) => {
const categoryTypes = {
'์ง์ถ' : [1, 2, 4],
'์์
' : [3]
}
const categories = await categoryDao.getCategoriesByIds(categoryTypes[type]);
categories.map((category) => { category.type = type })
return categories
}
module.exports = { getCategory }
```
1. ์์
/์ง์ถ์ ํ์
๊ณผ categoryId๋ฅผ ๋ชจ๋ ํ๋์ฝ๋ฉ ํด๋๊ธฐ ๋ณด๋ค๋ ํ์
์ผ๋ก ๋ชจ์์ ์ ๋ฆฌํ์๋ ๋ฐฉ๋ฒ์ด ๋ณด๋ค ํ์ฅ์ฑ ์๊ณ , ๊ฐ๋
์ฑ๋ ๋์ ๊ฒ ๊ฐ์ต๋๋ค.
2. category๋ฅผ dao์์ ํ๋์ฉ for loop์ผ๋ก getCategory dao์ query๋ฅผ ๋ ๋ฆฌ์๊ธฐ๋ณด๋ค๋ getCategoriesByIds ์ด๋ผ๋ dao ํจ์๋ฅผ ๋ง๋์
์ ๋ฐฐ์ด์ ํต์งธ๋ก ์ธ์๋ก ๋ณด๋ด๋ ๊ฒ์ด ์ข์ ๊ฒ ๊ฐ์ต๋๋ค.
๊ทธ๋์ dao๋จ SQL ์ฟผ๋ฆฌ๋ฌธ์์๋ ์ธ์๋ฅผ ๋ฐฐ์ด๋ก ๋ฐ์ผ์
์ ์ฌ๋ฌ ์นดํ
๊ณ ๋ฆฌ๋ฅผ ํ ๋ฒ์ SELECT ํ๋ ๋ฐฉ์์ ์ถ์ฒ๋๋ฆฝ๋๋ค.
Query ๋ฌธ์ ๋ณด๋ด๋ ํ์๋ฅผ 3ํ์์ 1ํ๋ก ์ค์ด๊ธฐ ์ํจ์
๋๋ค |
@@ -0,0 +1,20 @@
+const categoryService = require('../services/categoryService');
+const error = require('../utils/error');
+
+const getCategory = async (req, res) => {
+ try {
+ const { type } = req.query;
+ if (!type) {
+ error.throwErr(400, 'KEY_ERROR');
+ }
+ const categories = await categoryService.getCategory(type);
+ return res.status(200).json({message: 'GET_SUCCESS', 'category': categories});
+ } catch (err) {
+ console.error(err);
+ return res.status(err.statusCode || 500).json({message: err.message || 'INTERNAL_SERVER_ERROR'});
+ }
+}
+
+module.exports = {
+ getCategory
+}
\ No newline at end of file | JavaScript | ์๋ฌ ๋ฐ์์์ผ ๋ณด์
จ๋์? ๋ชจ๋ ์๋ฌ๊ฐ 'internal_server_error'๋ก ๋ ํ
๋ฐ, ์๋ํ์ ๋ฐ๊ฐ ๋ง์๊น์? |
@@ -0,0 +1,18 @@
+const categoryDao = require('../models/categoryDao');
+const error = require('../utils/error');
+
+const getCategory = async (type) => {
+ const categoryTypes = {
+ '์ง์ถ' : [1, 2, 3],
+ '์์
' : [4]
+ }
+
+ const categories = await categoryDao.getCategoriesByIds(categoryTypes[type]);
+ categories.map((category) => { category.type = type })
+
+ return categories;
+}
+
+module.exports = {
+ getCategory
+}
\ No newline at end of file | JavaScript | 3. ๊ทผ๋ณธ์ ์ธ ์ง๋ฌธ์ด ํ๋ ์๋๋ฐ, category๊ฐ flow_type_id๋ฅผ FK๋ก ๊ฐ์ง๊ณ ์์ผ๋ฉด, ํ๋์ฝ๋ฉ์ ์ํด๋ ๋ ๊ฒ ๊ฐ์๋ฐ FK ์์ฑํ์๋๊ฒ ์ข์ง ์์๊น์? ์ด๋ถ๋ถ์ ๋ฐฑ์๋ ํ ๊ฐ์ด ๋ผ์ด์ง์์ ์ ํ ๋ฒ ์ฐพ์์ ์ฃผ์ธ์! |
@@ -0,0 +1,20 @@
+const categoryService = require('../services/categoryService');
+const error = require('../utils/error');
+
+const getCategory = async (req, res) => {
+ try {
+ const { type } = req.query;
+ if (!type) {
+ error.throwErr(400, 'KEY_ERROR');
+ }
+ const categories = await categoryService.getCategory(type);
+ return res.status(200).json({message: 'GET_SUCCESS', 'category': categories});
+ } catch (err) {
+ console.error(err);
+ return res.status(err.statusCode || 500).json({message: err.message || 'INTERNAL_SERVER_ERROR'});
+ }
+}
+
+module.exports = {
+ getCategory
+}
\ No newline at end of file | JavaScript | ์ ํด๋น **error message** ๋ถ๋ถ ์์ ํ๊ฒ ์ต๋๋ค.
`=> 'INTERNAL_SERVER_ERROR' || err.message}` |
@@ -0,0 +1,14 @@
+const {DataSource} = require('typeorm');
+const dotenv = require('dotenv');
+dotenv.config();
+
+const appDataSource = new DataSource({
+ type : process.env.TYPEORM_CONNECTION,
+ host: process.env.TYPEORM_HOST,
+ port: process.env.TYPEORM_PORT,
+ username: process.env.TYPEORM_USERNAME,
+ password: process.env.TYPEORM_PASSWORD,
+ database: process.env.TYPEORM_DATABASE
+});
+
+module.exports = { appDataSource }
\ No newline at end of file | JavaScript | ๋ฐ์ํ๊ฒ ์ต๋๋ค! |
@@ -1,4 +1,4 @@
-import { EstimationInputDTO, Estimation } from '#estimations/estimation.types.js';
+import { EstimationInputDTO, Estimation, IsActivate } from '#estimations/estimation.types.js';
import { IEstimationRepository } from '#estimations/interfaces/estimation.repository.interface.js';
import { PrismaService } from '#global/prisma.service.js';
import { FindOptions } from '#types/options.type.js';
@@ -88,4 +88,52 @@ export class EstimationRepository implements IEstimationRepository {
take: pageSize,
});
}
+
+ // confirmedForId ๊ฐ์ด null์ด ์๋๋ฉด์ ์ด์ฌํ์ ๋๋๊ฒ์ด๋ค..~!
+ async findReviewable(userId: string, moveInfoIds: string[], page: number, pageSize: number) {
+ const estimations = await this.prisma.estimation.findMany({
+ where: {
+ confirmedForId: { in: moveInfoIds }, // ์๋ฃ๋ ์ด์ฌ์ ์ฐ๊ฒฐ๋ ๊ฒฌ์ ์ ์กฐํ
+ },
+ include: {
+ driver: true, // ๊ฒฌ์ ๊ณผ ๊ด๋ จ๋ ๋๋ผ์ด๋ฒ ์ ๋ณด
+ moveInfo: true, // ๊ฒฌ์ ๊ณผ ๊ด๋ จ๋ ์ด์ฌ ์ ๋ณด
+ reviews: true, // ๊ฒฌ์ ์ ์์ฑ๋ ๋ฆฌ๋ทฐ๋ค
+ },
+ skip: (page - 1) * pageSize,
+ take: pageSize,
+ });
+
+ // ๋ฆฌ๋ทฐ๊ฐ ์๋ ๊ฒฌ์ ๋ง ํํฐ๋ง
+ return estimations.filter(estimation => !estimation.reviews.some(review => review.ownerId === userId));
+ }
+
+ // ์ ์ ์ ์ด์ฌ ์ ๋ณด ๋ชฉ๋ก ๊ฐ์ ธ์ค๊ธฐ
+ async getUserMoveInfos(userId: string) {
+ return this.prisma.moveInfo.findMany({
+ where: { ownerId: userId }, // ๋ก๊ทธ์ธํ ์ ์ ์ ์ด์ฌ๋ง ์กฐํํ๊ธฐ
+ select: { id: true }, // ์ด์ฌ ID๋ง ์ ํ
+ });
+ }
+
+ // ์ง์ ๊ฒฌ์ ์์ฒญ ์ฌ๋ถ
+ async isDesignatedRequest(estimationId: string): Promise<IsActivate> {
+ const estimation = await this.prisma.estimation.findUnique({
+ where: { id: estimationId },
+ include: {
+ moveInfo: {
+ include: {
+ requests: {
+ where: {
+ status: 'APPLY', //
+ },
+ },
+ },
+ },
+ },
+ });
+
+ // ์ง์ ์์ฒญ์ด๋ฉด 'Active', ์ผ๋ฐ์์ฒญ์ด๋ฉด 'Inactive'
+ return estimation?.moveInfo.requests.length > 0 ? IsActivate.Active : IsActivate.Inactive;
+ }
} | TypeScript | ์๋ง๋ javascript ๋ ๋ฒจ์ด ์๋๋ผ prisma์์ findMany ํด์ค๋ ๋จ๊ณ์์ ์ด ์์
์ ํด์ ๊ฐ์ ธ์ฌ ์ ์์ ๊ฒ ๊ฐ์ต๋๋ค. ๋์ค์ ํ ๋ฒ ์ฐพ์๋ณด๋ฉด ์ข์ ๊ฒ ๊ฐ๋ค์. |
@@ -1,4 +1,4 @@
-import { EstimationInputDTO, Estimation } from '#estimations/estimation.types.js';
+import { EstimationInputDTO, Estimation, IsActivate } from '#estimations/estimation.types.js';
import { IEstimationRepository } from '#estimations/interfaces/estimation.repository.interface.js';
import { PrismaService } from '#global/prisma.service.js';
import { FindOptions } from '#types/options.type.js';
@@ -88,4 +88,52 @@ export class EstimationRepository implements IEstimationRepository {
take: pageSize,
});
}
+
+ // confirmedForId ๊ฐ์ด null์ด ์๋๋ฉด์ ์ด์ฌํ์ ๋๋๊ฒ์ด๋ค..~!
+ async findReviewable(userId: string, moveInfoIds: string[], page: number, pageSize: number) {
+ const estimations = await this.prisma.estimation.findMany({
+ where: {
+ confirmedForId: { in: moveInfoIds }, // ์๋ฃ๋ ์ด์ฌ์ ์ฐ๊ฒฐ๋ ๊ฒฌ์ ์ ์กฐํ
+ },
+ include: {
+ driver: true, // ๊ฒฌ์ ๊ณผ ๊ด๋ จ๋ ๋๋ผ์ด๋ฒ ์ ๋ณด
+ moveInfo: true, // ๊ฒฌ์ ๊ณผ ๊ด๋ จ๋ ์ด์ฌ ์ ๋ณด
+ reviews: true, // ๊ฒฌ์ ์ ์์ฑ๋ ๋ฆฌ๋ทฐ๋ค
+ },
+ skip: (page - 1) * pageSize,
+ take: pageSize,
+ });
+
+ // ๋ฆฌ๋ทฐ๊ฐ ์๋ ๊ฒฌ์ ๋ง ํํฐ๋ง
+ return estimations.filter(estimation => !estimation.reviews.some(review => review.ownerId === userId));
+ }
+
+ // ์ ์ ์ ์ด์ฌ ์ ๋ณด ๋ชฉ๋ก ๊ฐ์ ธ์ค๊ธฐ
+ async getUserMoveInfos(userId: string) {
+ return this.prisma.moveInfo.findMany({
+ where: { ownerId: userId }, // ๋ก๊ทธ์ธํ ์ ์ ์ ์ด์ฌ๋ง ์กฐํํ๊ธฐ
+ select: { id: true }, // ์ด์ฌ ID๋ง ์ ํ
+ });
+ }
+
+ // ์ง์ ๊ฒฌ์ ์์ฒญ ์ฌ๋ถ
+ async isDesignatedRequest(estimationId: string): Promise<IsActivate> {
+ const estimation = await this.prisma.estimation.findUnique({
+ where: { id: estimationId },
+ include: {
+ moveInfo: {
+ include: {
+ requests: {
+ where: {
+ status: 'APPLY', //
+ },
+ },
+ },
+ },
+ },
+ });
+
+ // ์ง์ ์์ฒญ์ด๋ฉด 'Active', ์ผ๋ฐ์์ฒญ์ด๋ฉด 'Inactive'
+ return estimation?.moveInfo.requests.length > 0 ? IsActivate.Active : IsActivate.Inactive;
+ }
} | TypeScript | ๋ค!! ์ฐพ์๋ณด๊ฒ ์ต๋๋ค !! ํ์๋ ์๋ ค์ฃผ์
์ ๊ฐ์ฌํฉ๋๋ค!!!! |
@@ -1,9 +1,14 @@
+import java.util.List;
import java.util.Scanner;
public class InputView {
private static final String INPUT_MONEY_MESSAGE = "๊ตฌ์
๊ธ์ก์ ์
๋ ฅํด ์ฃผ์ธ์.";
private static final String INPUT_WINNING_LOTTO_MESSAGE = "์ง๋ ์ฃผ ๋น์ฒจ ๋ฒํธ๋ฅผ ์
๋ ฅํด ์ฃผ์ธ์.";
+ private static final String MANUAL_LOTTO_COUNT_MESSAGE = "์๋์ผ๋ก ๊ตฌ๋งคํ ๋ก๋ ์๋ฅผ ์
๋ ฅํด ์ฃผ์ธ์.";
+ private static final String MANUAL_LOTTO_NUMBER_MESSAGE = "์๋์ผ๋ก ๊ตฌ๋งคํ ๋ฒํธ๋ฅผ ์
๋ ฅํด ์ฃผ์ธ์.";
+
+ private static final String INPUT_BONUS_NUMBER_MESSAGE = "๋ณด๋์ค ๋ณผ์ ์
๋ ฅํด ์ฃผ์ธ์.";
private static Scanner scanner = new Scanner(System.in);
@@ -12,6 +17,30 @@ public static int inputMoney() {
return Integer.parseInt(scanner.nextLine());
}
+ public static int manualLottoCount() {
+ System.out.println(MANUAL_LOTTO_COUNT_MESSAGE);
+ return Integer.parseInt(scanner.nextLine());
+ }
+
+ public static List<LottoNumber> manualLotto(int i, int manualLottoCount) {
+ if (i == 0) {
+ System.out.println(MANUAL_LOTTO_NUMBER_MESSAGE);
+ }
+
+ String inputs = scanner.nextLine();
+ if (i != manualLottoCount - 1) {
+ scanner.nextLine();
+ }
+
+ return StringParsingUtils.parseToLottoNumber(inputs);
+ }
+
+ public static BonusNumber inputBonusNumber() {
+ System.out.println(INPUT_BONUS_NUMBER_MESSAGE);
+ int bonusNumber = Integer.parseInt(scanner.nextLine());
+ return new BonusNumber(new LottoNumber(bonusNumber));
+ }
+
public static String inputWinningLottoNumber() {
System.out.println(INPUT_WINNING_LOTTO_MESSAGE);
return scanner.nextLine(); | Java | ์ ํ๋ฆฌ์ผ์ด์
์คํ์ ์์ผ๋ณด๋ ์
๋ ฅ์ ์ฐ๋ฌ์ ๋ฐ๊ธฐ ๋๋ฌธ์ ํ ์ค ์
๋ ฅ์ ๋ฐ์ ํ ์
๋ ฅ์ ํ ๋ฒ ๋ ๊ธฐ๋ค๋ฆฌ๊ณ ์์ต๋๋ค! ์ด๋ค ์๋๋ก ์ฌ์ฉํ์ ๊ฑธ๊น์? |
@@ -9,19 +9,24 @@ public LottoGame() {
statistics = new TreeMap<>();
}
- public int inputMoney(int money) {
+ public int calculateLottoCount(int money) {
return lottoCount = money / Lotto.LOTTO_PRICE;
}
- public LottoTicket generateAutoLottoTicket() {
+ public LottoTicket generateLottoTicket(int manualLottoCount) {
List<Lotto> lottos = new ArrayList<>();
- for(int i = 0; i < lottoCount; i++) {
+
+ for (int i = 0; i < manualLottoCount; i++) {
+ lottos.add(ManualLottoGenerator.generate(i, manualLottoCount));
+ }
+
+ for(int i = manualLottoCount; i < lottoCount; i++) {
lottos.add(AutoLottoGenerator.generate());
}
- return generateLottoTicket(lottos);
+ return makeLottoTicket(lottos);
}
- private LottoTicket generateLottoTicket(List<Lotto> lottos) {
+ private LottoTicket makeLottoTicket(List<Lotto> lottos) {
return lottoTicket = new LottoTicket(lottos);
}
| Java | ์๋ ๋ก๋์ ์๋ ๋ก๋๋ฅผ ํจ๊ป ์์ฑํ๊ณ ์๋๋ฐ ์ด๋ฅผ ๋ถ๋ฆฌ์์ผ๋ณด๋ฉด ์ด๋จ๊น์?
```
List<Lotto> lottos = InputView.manualLotto(lottoCount);
OutputView.printLottoTicket(game.generateLottoTicket(lottos));
```
์ฝ๋ ์์ฒด๋ก generateLottoTicket์์ ์๋๋ก๋๊น์ง ์์ฑํด์ฃผ๋ ๊ฒ์ธ์ง ํน์ ์๋ํ๋๋ก ์๋ ๋ก๋์ ์๋ ๋ก๋๋ฅผ ํจ๊ป ์์ฑํ๋ ๊ฒ์ธ์ง ๋ฉ์๋๋ช
๋ง ๋ณด๊ณ ๋ ์๋ฏธ๊ฐ ์กฐ๊ธ ๋ชจํธํ๋ค๊ณ ์๊ฐ๋ฉ๋๋ค. (๊ฐ์ธ์ ์๊ฐ์ผ๋ก)
๊ทธ๋ฆฌ๊ณ ๋์ค์ ์๊ตฌ์ฌํญ์ด ๋ณ๊ฒฝ๋์ด `์๋ ๋ก๋ ์์ฑ๋ง` ํน์ `์๋ ๋ก๋ ์์ฑ๋ง` ๊ทธ๋ฆฌ๊ณ ์ง๊ธ๊ณผ ๊ฐ์ด `์๋ ๋ก๋์ ์๋ ๋ก๋๋ฅผ ์์ด์` ํ ์ ์๋๋ก ํ๋ ํํ๋ผ๋ฉด ๋ฉ์๋ ์์ฒด๋ก ์กฐ๊ธ ๋ ๋ถ๋ช
ํ ์๋ฏธ๋ฅผ ๊ฐ์ง๊ณ ๋ฉ์๋๋ฅผ ์ฌํ์ฉํ ์ ์์ ๊ฒ ๊ฐ์์์ ~ |
@@ -0,0 +1,12 @@
+public class BonusNumber {
+ private LottoNumber bonusNumber;
+
+ public BonusNumber(LottoNumber bonusNumber) {
+ this.bonusNumber = bonusNumber;
+ }
+
+ public LottoNumber getBonusNumber() {
+ return bonusNumber;
+ }
+}
+ | Java | LottoNumber ์์ฒด๋ ์์๊ฐ์ ํฌ์ฅํ ํํ๋ก LottoNumber ํ์
์ผ๋ก bonusNumber๋ฅผ ์ฌ์ฉํ ์ ์๋๋ฐ ์ด๋ฅผ ํ ๋ฒ ๋ ํฌ์ฅํ์ฌ ์ฌ์ฉํ์ ์ด์ ๊ฐ ์์ผ์ค๊น์? BonusNumber์์๋ ์ด๋ ํ ํ์๋ฅผ ํ์ง ์๊ณ ํฌ์ฅ๋ ๊ฐ์ ํ ๋ฒ ๋ Wrapping ํ๋ ํํ๋ก๋ง ์ฌ์ฉ๋๊ณ ์๋๋ฐ ๋ถํ์ํด ๋ณด์ฌ์์~ |
@@ -43,6 +43,10 @@ public int match(WinningLotto winningLotto) {
return matchCount;
}
+ public boolean isBonusMatch(WinningLotto winningLotto) {
+ return lotto.contains(winningLotto.getBonusNumber());
+ }
+
public boolean contains(LottoNumber lottoNumber) {
return lotto.contains(lottoNumber);
} | Java | lotto์ ๋ณด๋์ค ์ซ์๊ฐ ํฌํจ๋์ด์๋์ง ํ๋ณํ๋ ์ญํ ์ ํ๋ ๋ฉ์๋๋ก ๋ณด์ด๋ค์. ๋จ์ํ ํ๋ณ ์ฌ๋ถ๋ผ๋ฉด boolean ํ์
์ผ๋ก ๋ณ๊ฒฝํด์ฃผ๋ฉด ์ด๋จ๊น์? ๋ง์ฝ ๋ณด๋์ค ์ซ์๊ฐ 1๊ฐ ์ด์์ด๋ผ๋ ์๊ตฌ์ฌํญ ๋ณ๊ฒฝ์ ์ผ๋ํ ๊ตฌํ์ด๋ผ๋ฉด 1, 0์ ๋ฆฌํดํ๋ ๊ฒ๋ณด๋ค ๊ตฌ์ฒด์ ์ผ๋ก ๋งค์นญ๋ ๊ฐฏ์๋ฅผ ๋ฆฌํดํด์ฃผ๋ ์์ผ๋ก ๋ณ๊ฒฝํด๋ณด๋ฉด ํ์ฅ์ ์ ๋ฆฌํ ๊ตฌํ์ด ๋ ๊ฒ ๊ฐ์์. ๋ฉ์๋๋ช
๋ ์๋ฏธ์ ๋ฌ์ ์กฐ๊ธ ๋ ๋ช
ํํ๊ฒ ํ๋ฉด ์๋ฒฝํ ๊ฒ ๊ฐ์ต๋๋คb |
@@ -6,6 +6,8 @@ public class OutputView {
private static final String RESULT_STATISTICS_MESSAGE = "๋น์ฒจ ํต๊ณ";
private static final String BOUNDARY_LINE = "---------";
private static final String TOTAL_EARNING_RATIO_MESSAGE = "์ด ์์ต๋ฅ ์ %s ์
๋๋ค.";
+ private static final int SECOND_RANK_COUNT = 5;
+ private static final int MINIMUM_PRIZE_COUNT = 3;
public static void printLottoCount(int lottoCount) {
System.out.printf((LOTTO_PURCHASE_COMPLETE_MESSAGE) + "%n", lottoCount);
@@ -22,12 +24,29 @@ public static void printStatistics(Map<Rank, Integer> statistics) {
System.out.println(BOUNDARY_LINE);
for (Rank rank : statistics.keySet()) {
- System.out.print(String.format("%d ๊ฐ ์ผ์น (%d์)", rank.getMatchCount(), rank.getReward()));
- System.out.println(" - " + statistics.get(rank) + "๊ฐ");
+ printResult(rank, statistics);
}
}
public static void printEarningRate(String earningRate) {
System.out.printf((TOTAL_EARNING_RATIO_MESSAGE) + "%n", earningRate);
}
+
+ private static void printResult(Rank rank, Map<Rank, Integer> statistics) {
+ if (validateMatchCountIs5(rank)) {
+ System.out.print(String.format("%d ๊ฐ ์ผ์น, ๋ณด๋์ค ๋ณผ ์ผ์น (%d์)", rank.getMatchCount(), rank.getReward()));
+ System.out.println(" - " + statistics.get(rank) + "๊ฐ");
+ } else if (validateMatchCountOver3(rank)) {
+ System.out.print(String.format("%d ๊ฐ ์ผ์น (%d์)", rank.getMatchCount(), rank.getReward()));
+ System.out.println(" - " + statistics.get(rank) + "๊ฐ");
+ }
+ }
+
+ private static boolean validateMatchCountIs5(Rank rank) {
+ return rank.getMatchCount() == SECOND_RANK_COUNT && rank.isBonusMatch();
+ }
+
+ private static boolean validateMatchCountOver3(Rank rank) {
+ return rank.getMatchCount() >= MINIMUM_PRIZE_COUNT;
+ }
}
\ No newline at end of file | Java | ์ ์ฝ์ฌํญ ์๊ตฌ์ฌํญ์ ๋ฐ์ํ ๋ `rank.getMatch() == 5 && rank.getBonusMatchCount() == 1` ์ ๊ฐ์ ์ฝ๋๋ฅผ ๋ฉ์๋๋ก ๋ฐ๋ก ๋ถ๋ฆฌํด์ `validateMatchCount(rank)`์ ๊ฐ์ด ์์ฑํ๋ค๋ฉด ์ฝ๋๋ฅผ ์ฝ๋ ๋ค๋ฅธ ๊ฐ๋ฐ์๊ฐ ์ ์ฝ์ฌํญ์ ํ์
ํ๋๋ฐ ๋ ์ฌ์ธ ๊ฒ ๊ฐ์ต๋๋ค. ๋ฉ์๋๋ช
๋ง ๋ณด๊ณ "์ด ์ง์ ์์ validate ์ฒดํฌ๋ฅผ ํ๋ ๊ตฌ๋"๋ผ๊ณ ํ๋์ ํ์
์ด ๋๊ณ , ๊ตฌ์ฒด์ ์ธ ์ ์ฝ์ฌํญ์ด ๊ถ๊ธํ ๋ ํด๋น ๋ฉ์๋ ๋ด๋ถ ๊ตฌํ๋ง ์ฐพ์๋ณด๋ฉด ๋๊ฒ ๋ ๊ฒ ๊ฐ์ต๋๋ค. ์ถ๊ฐ๋ก ์ซ์๋ค๋ ์์ ์ฒ๋ฆฌํด์ฃผ๋ฉด ๋ ์ข์ ๊ฒ ๊ฐ์ต๋๋ค. |
@@ -1,10 +1,33 @@
+import exception.*;
+import java.util.List;
+
public class Application {
public static void main(String[] args) {
LottoGame game = new LottoGame();
- OutputView.printLottoCount(game.inputMoney(new Money(InputView.inputMoney()).getMoney()));
- OutputView.printLottoTicket(game.generateAutoLottoTicket());
- WinningLotto winningLotto = new WinningLotto(StringParsingUtils.parseToLottoNumber(InputView.inputWinningLottoNumber()));
- OutputView.printStatistics(game.calculateRankStatistics(winningLotto));
- OutputView.printEarningRate(game.calculateEarningRatio());
+ while (true) {
+ try {
+ OutputView.printLottoCount(game.calculateLottoCount(new Money(InputView.inputMoney()).getMoney()));
+ int manualLottoCount = InputView.manualLottoCount();
+
+ OutputView.printLottoTicket(game.generateLottoTicket(manualLottoCount));
+ List<LottoNumber> lottoNumbers = StringParsingUtils.parseToLottoNumber(InputView.inputWinningLottoNumber());
+ BonusNumber bonusNumber = InputView.inputBonusNumber();
+ WinningLotto winningLotto = new WinningLotto(lottoNumbers, bonusNumber);
+
+ OutputView.printStatistics(game.calculateRankStatistics(winningLotto));
+ OutputView.printEarningRate(game.calculateEarningRatio());
+ break;
+ } catch (MoneyUnderMinMoneyException moneyUnderMinMoneyException) {
+ System.out.println(moneyUnderMinMoneyException.getMessage());
+ } catch (LottoSizeMismatchException lottoSizeMismatchException) {
+ System.out.println(lottoSizeMismatchException.getMessage());
+ } catch (LottoIsNotUniqueException lottoIsNotUniqueException) {
+ System.out.println(lottoIsNotUniqueException.getMessage());
+ } catch (LottoNumberOutOfRangeException lottoNumberOutOfRangeException) {
+ System.out.println(lottoNumberOutOfRangeException.getMessage());
+ } catch (BonusNumberDuplicatedException bonusNumberDuplicatedException) {
+ System.out.println(bonusNumberDuplicatedException.getMessage());
+ }
+ }
}
}
\ No newline at end of file | Java | ํฐ ์์๋ ์๋๊ฒ ์ง๋ง ๊ด๋ จ์ฑ์ ๋ฐ๋ผ์ ๊ฐํ์ ์ถ๊ฐํด ๊ตฌ๋ถ ์ง์ด์ฃผ๋ ๊ฒ๋ ๊ฐ๋
์ฑ์ ๋์ด๋ ์์๋ผ๊ณ ์๊ฐํฉ๋๋ค! |
@@ -1,9 +1,14 @@
+import java.util.List;
import java.util.Scanner;
public class InputView {
private static final String INPUT_MONEY_MESSAGE = "๊ตฌ์
๊ธ์ก์ ์
๋ ฅํด ์ฃผ์ธ์.";
private static final String INPUT_WINNING_LOTTO_MESSAGE = "์ง๋ ์ฃผ ๋น์ฒจ ๋ฒํธ๋ฅผ ์
๋ ฅํด ์ฃผ์ธ์.";
+ private static final String MANUAL_LOTTO_COUNT_MESSAGE = "์๋์ผ๋ก ๊ตฌ๋งคํ ๋ก๋ ์๋ฅผ ์
๋ ฅํด ์ฃผ์ธ์.";
+ private static final String MANUAL_LOTTO_NUMBER_MESSAGE = "์๋์ผ๋ก ๊ตฌ๋งคํ ๋ฒํธ๋ฅผ ์
๋ ฅํด ์ฃผ์ธ์.";
+
+ private static final String INPUT_BONUS_NUMBER_MESSAGE = "๋ณด๋์ค ๋ณผ์ ์
๋ ฅํด ์ฃผ์ธ์.";
private static Scanner scanner = new Scanner(System.in);
@@ -12,6 +17,30 @@ public static int inputMoney() {
return Integer.parseInt(scanner.nextLine());
}
+ public static int manualLottoCount() {
+ System.out.println(MANUAL_LOTTO_COUNT_MESSAGE);
+ return Integer.parseInt(scanner.nextLine());
+ }
+
+ public static List<LottoNumber> manualLotto(int i, int manualLottoCount) {
+ if (i == 0) {
+ System.out.println(MANUAL_LOTTO_NUMBER_MESSAGE);
+ }
+
+ String inputs = scanner.nextLine();
+ if (i != manualLottoCount - 1) {
+ scanner.nextLine();
+ }
+
+ return StringParsingUtils.parseToLottoNumber(inputs);
+ }
+
+ public static BonusNumber inputBonusNumber() {
+ System.out.println(INPUT_BONUS_NUMBER_MESSAGE);
+ int bonusNumber = Integer.parseInt(scanner.nextLine());
+ return new BonusNumber(new LottoNumber(bonusNumber));
+ }
+
public static String inputWinningLottoNumber() {
System.out.println(INPUT_WINNING_LOTTO_MESSAGE);
return scanner.nextLine(); | Java | InputView์์ ์๋ ๋ก๋์ ๋ํด ๋ฒํธ๋ฅผ ์
๋ ฅ ๋ฐ๋ ์ญํ ์ ๋ํด ์ง์ ๋ก๋๋ฅผ ์์ฑํ๋ ์ญํ ๊น์ง ํ๊ณ ์๋ค์. ์ญํ ์ ๋ถ๋ฆฌํด๋ณผ ์ ์์๊น์? ๋ถ๋ฆฌํ์ ๋ ์ด๋ค ์ด์ ์ด ์๊ธธ๊น์? |
@@ -4,44 +4,36 @@
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.util.ArrayList;
-import java.util.HashMap;
import java.util.List;
-import java.util.Map;
import static org.assertj.core.api.Assertions.assertThat;
public class LottoGameTest {
@Test
- @DisplayName("์ค์ ๋ก๋ ์์ต๋ฅ ๊ณผ ์์ํ ๋ก๋ ์์ต๋ฅ ์ด ๊ฐ๋ค๋ฉด ์ฑ๊ณต์ด๋ค.")
- public void should_success_when_real_lotto_earning_ratio_matches_expected_lotto_yield() throws NoSuchMethodException, IllegalAccessException, IllegalArgumentException, InvocationTargetException {
- // given
+ public void should_success_when_real_lotto_earning_ratio_matches_expected_lotto_yield() throws NoSuchMethodException, IllegalAccessException, IllegalArgumentException, InvocationTargetException{
LottoGame lottoGame = new LottoGame();
- lottoGame.inputMoney(1000);
-
- List<LottoNumber> testWinningLotto = new ArrayList<>();
-
- for (int i = 1; i < 7; i++){
- testWinningLotto.add(new LottoNumber(i));
+ lottoGame.calculateLottoCount(1000);
+ List<LottoNumber> lottoNumbers = new ArrayList<>();
+ for(int i=1; i<7; i++) {
+ lottoNumbers.add(new LottoNumber(i));
}
+ List<Lotto> lottos = new ArrayList<>();
+ lottos.add(new Lotto(lottoNumbers));
- List<Lotto> autoGeneratedLottos = new ArrayList<>();
- autoGeneratedLottos.add(new Lotto(testWinningLotto));
-
- Method method = lottoGame.getClass().getDeclaredMethod("generateLottoTicket",List.class);
+ Method method = lottoGame.getClass().getDeclaredMethod("makeLottoTicket", List.class);
method.setAccessible(true);
- method.invoke(lottoGame, autoGeneratedLottos);
-
- lottoGame.calculateRankStatistics(new WinningLotto(testWinningLotto));
+ method.invoke(lottoGame, lottos);
- String expectedEarningRatio = "200000000.0";
+ WinningLotto winningLotto = new WinningLotto(lottoNumbers, new BonusNumber(new LottoNumber(7)));
+ lottoGame.calculateRankStatistics(winningLotto);
- // when
+ //when
String earningRatio = lottoGame.calculateEarningRatio();
// then
- assertThat(earningRatio).isEqualTo(expectedEarningRatio);
+ assertThat(earningRatio).isEqualTo("200000000.0");
}
@Test
@@ -53,9 +45,35 @@ public void should_success_when_input_money_return_lotto_as_much_as_input_money(
LottoGame lottoGame = new LottoGame();
// when
- int lottoCount = lottoGame.inputMoney(money);
+ int lottoCount = lottoGame.calculateLottoCount(money);
// then
assertThat(lottoCount).isEqualTo(expectedLottoCount);
}
+
+ @Test
+ @DisplayName("๊ตฌ์
์ฅ์๋งํผ ๋ก๋ ํฐ์ผ์ ๋ก๋๊ฐ ์ถ๊ฐ๋๋ค๋ฉด ์ฑ๊ณต์ด๋ค.")
+ public void should_success_when_lotto_ticket_can_add_lottos_as_much_as_money() {
+ // given
+ int manualLottoCount = 1;
+
+ LottoGame lottoGame = new LottoGame();
+ int lottoCount = lottoGame.calculateLottoCount(3000);
+
+ List<LottoNumber> lottoNumbers = new ArrayList<>();
+ for (int i = 1; i < 7; i++) {
+ lottoNumbers.add(new LottoNumber(i));
+ }
+
+ List<Lotto> manualLotto = new ArrayList<>();
+ for (int i = 0; i < manualLottoCount; i++) {
+ manualLotto.add(new Lotto(lottoNumbers));
+ }
+
+ // when
+ LottoTicket lottoTicket = lottoGame.generateLottoTicket(manualLottoCount);
+
+ // then
+ assertThat(lottoTicket.getLottoTicket().size()).isEqualTo(lottoCount);
+ }
}
\ No newline at end of file | Java | `inputMoney()`๋ผ๋ ์ด๋ฆ์ ๋ฉ์๋์ ๊ฒฐ๊ณผ๊ฐ์ผ๋ก ๋ก๋ ๊ฐฏ์๊ฐ ๋์ค๋๊ฒ ์กฐ๊ธ ์ด์ํ ๊ฒ ๊ฐ์ต๋๋ค. ์
๋ ฅ๋ฐ๋ ๋ฉ์๋์ ๊ฐฏ์๋ฅผ ๋ฐํํ๋ ๋ฉ์๋๋ก ๋ถ๋ฆฌํด๋ณด๋ฉด ์ด๋จ๊น์? |
@@ -4,44 +4,36 @@
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.util.ArrayList;
-import java.util.HashMap;
import java.util.List;
-import java.util.Map;
import static org.assertj.core.api.Assertions.assertThat;
public class LottoGameTest {
@Test
- @DisplayName("์ค์ ๋ก๋ ์์ต๋ฅ ๊ณผ ์์ํ ๋ก๋ ์์ต๋ฅ ์ด ๊ฐ๋ค๋ฉด ์ฑ๊ณต์ด๋ค.")
- public void should_success_when_real_lotto_earning_ratio_matches_expected_lotto_yield() throws NoSuchMethodException, IllegalAccessException, IllegalArgumentException, InvocationTargetException {
- // given
+ public void should_success_when_real_lotto_earning_ratio_matches_expected_lotto_yield() throws NoSuchMethodException, IllegalAccessException, IllegalArgumentException, InvocationTargetException{
LottoGame lottoGame = new LottoGame();
- lottoGame.inputMoney(1000);
-
- List<LottoNumber> testWinningLotto = new ArrayList<>();
-
- for (int i = 1; i < 7; i++){
- testWinningLotto.add(new LottoNumber(i));
+ lottoGame.calculateLottoCount(1000);
+ List<LottoNumber> lottoNumbers = new ArrayList<>();
+ for(int i=1; i<7; i++) {
+ lottoNumbers.add(new LottoNumber(i));
}
+ List<Lotto> lottos = new ArrayList<>();
+ lottos.add(new Lotto(lottoNumbers));
- List<Lotto> autoGeneratedLottos = new ArrayList<>();
- autoGeneratedLottos.add(new Lotto(testWinningLotto));
-
- Method method = lottoGame.getClass().getDeclaredMethod("generateLottoTicket",List.class);
+ Method method = lottoGame.getClass().getDeclaredMethod("makeLottoTicket", List.class);
method.setAccessible(true);
- method.invoke(lottoGame, autoGeneratedLottos);
-
- lottoGame.calculateRankStatistics(new WinningLotto(testWinningLotto));
+ method.invoke(lottoGame, lottos);
- String expectedEarningRatio = "200000000.0";
+ WinningLotto winningLotto = new WinningLotto(lottoNumbers, new BonusNumber(new LottoNumber(7)));
+ lottoGame.calculateRankStatistics(winningLotto);
- // when
+ //when
String earningRatio = lottoGame.calculateEarningRatio();
// then
- assertThat(earningRatio).isEqualTo(expectedEarningRatio);
+ assertThat(earningRatio).isEqualTo("200000000.0");
}
@Test
@@ -53,9 +45,35 @@ public void should_success_when_input_money_return_lotto_as_much_as_input_money(
LottoGame lottoGame = new LottoGame();
// when
- int lottoCount = lottoGame.inputMoney(money);
+ int lottoCount = lottoGame.calculateLottoCount(money);
// then
assertThat(lottoCount).isEqualTo(expectedLottoCount);
}
+
+ @Test
+ @DisplayName("๊ตฌ์
์ฅ์๋งํผ ๋ก๋ ํฐ์ผ์ ๋ก๋๊ฐ ์ถ๊ฐ๋๋ค๋ฉด ์ฑ๊ณต์ด๋ค.")
+ public void should_success_when_lotto_ticket_can_add_lottos_as_much_as_money() {
+ // given
+ int manualLottoCount = 1;
+
+ LottoGame lottoGame = new LottoGame();
+ int lottoCount = lottoGame.calculateLottoCount(3000);
+
+ List<LottoNumber> lottoNumbers = new ArrayList<>();
+ for (int i = 1; i < 7; i++) {
+ lottoNumbers.add(new LottoNumber(i));
+ }
+
+ List<Lotto> manualLotto = new ArrayList<>();
+ for (int i = 0; i < manualLottoCount; i++) {
+ manualLotto.add(new Lotto(lottoNumbers));
+ }
+
+ // when
+ LottoTicket lottoTicket = lottoGame.generateLottoTicket(manualLottoCount);
+
+ // then
+ assertThat(lottoTicket.getLottoTicket().size()).isEqualTo(lottoCount);
+ }
}
\ No newline at end of file | Java | ๊ฒฐ๊ณผ๊ฐ๊ณผ ๋น๊ตํ๋ ๊ฐ์ lottoCount๊ฐ ์๋ ์ง์ ์ ์ธ ์ซ์๋ก ๋น๊ตํ๋ฉด ์ด๋จ๊น์? ๋ง์ฝ ์ค์๋ก lottoGame.inputMoney()์์ ์
๋ ฅ๋ฐ์ ๋์ ๋ฐ์ฌ๋ฆผํด์ ์ฅ์๋ฅผ ์ถ๋ ฅํ๋๋ก ํด๋ฒ๋ ธ๋ค๋ฉด ํฐ์ผ์ ์ฌ์ด์ฆ๊ฐ 4๋๋ผ๋ ํ
์คํธ๊ฐ ํต๊ณผํ๊ฒ ๋ ๊ฒ ๊ฐ์ต๋๋ค. ์ฌ์ค ์ง๊ธ ํ
์คํธ ์ฝ๋๋ `lottoGame.inputMoney()`๊ฐ ๋จผ์ ๋ณด์ฅ๋์ด์ผํ๋๋ง ์ ํํ ํ
์คํธ๊ฐ ๊ฐ๋ฅํ ์ฝ๋๋ผ๊ณ ๋ณผ ์ ์์ ๊ฒ ๊ฐ์ต๋๋ค. ํ
์คํธ๋ฅผ ํ๋ค๋ณด๋ฉด ์ด์ฉ ์ ์๋ ๋ถ๋ถ์ผ ์๋ ์๊ณ , ์ ๋ง์ด ์ ๋ต์ ์๋์ง๋ง ๊ฒฐ๊ณผ๊ฐ์ ๊ฐ๊ธ์ ๋ ์ ํํ ๊ฒ์ ์์กดํด์ผํ์ง ์์๊น ์๊ฐ์ด ๋ค์ด ๋ฆฌ๋ทฐ ๋จ๊ฒจ๋ดค์ต๋๋ค. |
@@ -1,9 +1,14 @@
+import java.util.List;
import java.util.Scanner;
public class InputView {
private static final String INPUT_MONEY_MESSAGE = "๊ตฌ์
๊ธ์ก์ ์
๋ ฅํด ์ฃผ์ธ์.";
private static final String INPUT_WINNING_LOTTO_MESSAGE = "์ง๋ ์ฃผ ๋น์ฒจ ๋ฒํธ๋ฅผ ์
๋ ฅํด ์ฃผ์ธ์.";
+ private static final String MANUAL_LOTTO_COUNT_MESSAGE = "์๋์ผ๋ก ๊ตฌ๋งคํ ๋ก๋ ์๋ฅผ ์
๋ ฅํด ์ฃผ์ธ์.";
+ private static final String MANUAL_LOTTO_NUMBER_MESSAGE = "์๋์ผ๋ก ๊ตฌ๋งคํ ๋ฒํธ๋ฅผ ์
๋ ฅํด ์ฃผ์ธ์.";
+
+ private static final String INPUT_BONUS_NUMBER_MESSAGE = "๋ณด๋์ค ๋ณผ์ ์
๋ ฅํด ์ฃผ์ธ์.";
private static Scanner scanner = new Scanner(System.in);
@@ -12,6 +17,30 @@ public static int inputMoney() {
return Integer.parseInt(scanner.nextLine());
}
+ public static int manualLottoCount() {
+ System.out.println(MANUAL_LOTTO_COUNT_MESSAGE);
+ return Integer.parseInt(scanner.nextLine());
+ }
+
+ public static List<LottoNumber> manualLotto(int i, int manualLottoCount) {
+ if (i == 0) {
+ System.out.println(MANUAL_LOTTO_NUMBER_MESSAGE);
+ }
+
+ String inputs = scanner.nextLine();
+ if (i != manualLottoCount - 1) {
+ scanner.nextLine();
+ }
+
+ return StringParsingUtils.parseToLottoNumber(inputs);
+ }
+
+ public static BonusNumber inputBonusNumber() {
+ System.out.println(INPUT_BONUS_NUMBER_MESSAGE);
+ int bonusNumber = Integer.parseInt(scanner.nextLine());
+ return new BonusNumber(new LottoNumber(bonusNumber));
+ }
+
public static String inputWinningLottoNumber() {
System.out.println(INPUT_WINNING_LOTTO_MESSAGE);
return scanner.nextLine(); | Java | ์๋์ด ์๋ ์๋์ผ๋ก ์
๋ ฅํ ๊ฐฏ์๋งํผ ์
๋ ฅ์ ๋ฐ๋๋ก ์๊ตฌ์ฌํญ์ด ๊ธฐ์ฌ๋์ด ์๊ธฐ ๋๋ฌธ์, ๋ง์ฝ `์๋์ผ๋ก ๊ตฌ๋งคํ ๋ก๋ ์๋ฅผ ์
๋ ฅํด ์ฃผ์ธ์.` ์์ 2๊ฐ๋ฅผ ์
๋ ฅํ๋ค๋ฉด, 2์ค์ ์
๋ ฅ ๊ฐ์ ๋ฃ์ด์ฃผ์ด์ผ ํฉ๋๋ค! |
@@ -1,9 +1,14 @@
+import java.util.List;
import java.util.Scanner;
public class InputView {
private static final String INPUT_MONEY_MESSAGE = "๊ตฌ์
๊ธ์ก์ ์
๋ ฅํด ์ฃผ์ธ์.";
private static final String INPUT_WINNING_LOTTO_MESSAGE = "์ง๋ ์ฃผ ๋น์ฒจ ๋ฒํธ๋ฅผ ์
๋ ฅํด ์ฃผ์ธ์.";
+ private static final String MANUAL_LOTTO_COUNT_MESSAGE = "์๋์ผ๋ก ๊ตฌ๋งคํ ๋ก๋ ์๋ฅผ ์
๋ ฅํด ์ฃผ์ธ์.";
+ private static final String MANUAL_LOTTO_NUMBER_MESSAGE = "์๋์ผ๋ก ๊ตฌ๋งคํ ๋ฒํธ๋ฅผ ์
๋ ฅํด ์ฃผ์ธ์.";
+
+ private static final String INPUT_BONUS_NUMBER_MESSAGE = "๋ณด๋์ค ๋ณผ์ ์
๋ ฅํด ์ฃผ์ธ์.";
private static Scanner scanner = new Scanner(System.in);
@@ -12,6 +17,30 @@ public static int inputMoney() {
return Integer.parseInt(scanner.nextLine());
}
+ public static int manualLottoCount() {
+ System.out.println(MANUAL_LOTTO_COUNT_MESSAGE);
+ return Integer.parseInt(scanner.nextLine());
+ }
+
+ public static List<LottoNumber> manualLotto(int i, int manualLottoCount) {
+ if (i == 0) {
+ System.out.println(MANUAL_LOTTO_NUMBER_MESSAGE);
+ }
+
+ String inputs = scanner.nextLine();
+ if (i != manualLottoCount - 1) {
+ scanner.nextLine();
+ }
+
+ return StringParsingUtils.parseToLottoNumber(inputs);
+ }
+
+ public static BonusNumber inputBonusNumber() {
+ System.out.println(INPUT_BONUS_NUMBER_MESSAGE);
+ int bonusNumber = Integer.parseInt(scanner.nextLine());
+ return new BonusNumber(new LottoNumber(bonusNumber));
+ }
+
public static String inputWinningLottoNumber() {
System.out.println(INPUT_WINNING_LOTTO_MESSAGE);
return scanner.nextLine(); | Java | <img width="370" alt="แแ
ณแแ
ณแ
แ
ตแซแแ
ฃแบ 2022-07-04 แแ
ฉแแ
ฎ 7 14 35" src="https://user-images.githubusercontent.com/62830487/177134400-0365bef0-a31c-4a57-9020-e294daa65100.png">
๋ก์ง์ ๋ฌธ์ ๊ฐ ์์ด๋ณด์ด๋ค์. ์๋ ๋ก๋ 2์ฅ์ ๊ตฌ๋งคํด์ ๋ก๋ 2์ฅ์ ๋ฒํธ๋ฅผ ์
๋ ฅํ๋๋ฐ ์
๋ ฅ์ ํ ๋ฒ ๋ ๊ธฐ๋ค๋ฆฌ๊ณ ์๋ค์. ํ์ธ ๋ถํ๋๋ ค์. |
@@ -9,19 +9,24 @@ public LottoGame() {
statistics = new TreeMap<>();
}
- public int inputMoney(int money) {
+ public int calculateLottoCount(int money) {
return lottoCount = money / Lotto.LOTTO_PRICE;
}
- public LottoTicket generateAutoLottoTicket() {
+ public LottoTicket generateLottoTicket(int manualLottoCount) {
List<Lotto> lottos = new ArrayList<>();
- for(int i = 0; i < lottoCount; i++) {
+
+ for (int i = 0; i < manualLottoCount; i++) {
+ lottos.add(ManualLottoGenerator.generate(i, manualLottoCount));
+ }
+
+ for(int i = manualLottoCount; i < lottoCount; i++) {
lottos.add(AutoLottoGenerator.generate());
}
- return generateLottoTicket(lottos);
+ return makeLottoTicket(lottos);
}
- private LottoTicket generateLottoTicket(List<Lotto> lottos) {
+ private LottoTicket makeLottoTicket(List<Lotto> lottos) {
return lottoTicket = new LottoTicket(lottos);
}
| Java | ๊ฒฐ๊ตญ์ ์๋ ๋ก๋์ ์๋ ๋ก๋ ๋ชจ๋ ํ๋์ ๋ก๋ ํฐ์ผ์ผ๋ก ํฉ์ณ์ง๋ ๋ถ๋ถ์ด ํ์ํ๊ธฐ ๋๋ฌธ์, ํ์ฌ `generateLottoTicket()` ๋ด์ ์๋๊ณผ ์๋ ๋ก๋ ์์ฑ ๊ฐ๊ฐ์ ๋ฐ๋ณต๋ฌธ์ `generateManualLottoTicket()`๊ณผ `generateAutoLottoTicket()` ์ผ๋ก ๋ฉ์๋๋ฅผ ๋ถ๋ฆฌํด๋ณด๋๋ก ํ๊ฒ ์ต๋๋ค |
@@ -0,0 +1,12 @@
+public class BonusNumber {
+ private LottoNumber bonusNumber;
+
+ public BonusNumber(LottoNumber bonusNumber) {
+ this.bonusNumber = bonusNumber;
+ }
+
+ public LottoNumber getBonusNumber() {
+ return bonusNumber;
+ }
+}
+ | Java | @sunghyuki ๊ธฐ์กด์ Lotto ๊ฐ์ฒด๋ก๋ง ๊ตฌ์ฑ๋ WinningLotto์ BonusNumber๋ฅผ ์ถ๊ฐํ์ฌ, ๋ก๋ ๋น์ฒจ ๋ฒํธ ์ค 5๊ฐ๊ฐ ์ผ์นํ๋ ๊ฒฝ์ฐ BonusNumber ์ผ์น ์ฌ๋ถ ํ์ธ์ ๋ถ๋ช
ํ๊ฒ ํ๊ธฐ ์ํด LottoNumber ํ์
์ผ๋ก ๊ตฌ์ฑ๋ BonusNumber๋ฅผ ์์ฑํ์ต๋๋ค~ |
@@ -4,44 +4,36 @@
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.util.ArrayList;
-import java.util.HashMap;
import java.util.List;
-import java.util.Map;
import static org.assertj.core.api.Assertions.assertThat;
public class LottoGameTest {
@Test
- @DisplayName("์ค์ ๋ก๋ ์์ต๋ฅ ๊ณผ ์์ํ ๋ก๋ ์์ต๋ฅ ์ด ๊ฐ๋ค๋ฉด ์ฑ๊ณต์ด๋ค.")
- public void should_success_when_real_lotto_earning_ratio_matches_expected_lotto_yield() throws NoSuchMethodException, IllegalAccessException, IllegalArgumentException, InvocationTargetException {
- // given
+ public void should_success_when_real_lotto_earning_ratio_matches_expected_lotto_yield() throws NoSuchMethodException, IllegalAccessException, IllegalArgumentException, InvocationTargetException{
LottoGame lottoGame = new LottoGame();
- lottoGame.inputMoney(1000);
-
- List<LottoNumber> testWinningLotto = new ArrayList<>();
-
- for (int i = 1; i < 7; i++){
- testWinningLotto.add(new LottoNumber(i));
+ lottoGame.calculateLottoCount(1000);
+ List<LottoNumber> lottoNumbers = new ArrayList<>();
+ for(int i=1; i<7; i++) {
+ lottoNumbers.add(new LottoNumber(i));
}
+ List<Lotto> lottos = new ArrayList<>();
+ lottos.add(new Lotto(lottoNumbers));
- List<Lotto> autoGeneratedLottos = new ArrayList<>();
- autoGeneratedLottos.add(new Lotto(testWinningLotto));
-
- Method method = lottoGame.getClass().getDeclaredMethod("generateLottoTicket",List.class);
+ Method method = lottoGame.getClass().getDeclaredMethod("makeLottoTicket", List.class);
method.setAccessible(true);
- method.invoke(lottoGame, autoGeneratedLottos);
-
- lottoGame.calculateRankStatistics(new WinningLotto(testWinningLotto));
+ method.invoke(lottoGame, lottos);
- String expectedEarningRatio = "200000000.0";
+ WinningLotto winningLotto = new WinningLotto(lottoNumbers, new BonusNumber(new LottoNumber(7)));
+ lottoGame.calculateRankStatistics(winningLotto);
- // when
+ //when
String earningRatio = lottoGame.calculateEarningRatio();
// then
- assertThat(earningRatio).isEqualTo(expectedEarningRatio);
+ assertThat(earningRatio).isEqualTo("200000000.0");
}
@Test
@@ -53,9 +45,35 @@ public void should_success_when_input_money_return_lotto_as_much_as_input_money(
LottoGame lottoGame = new LottoGame();
// when
- int lottoCount = lottoGame.inputMoney(money);
+ int lottoCount = lottoGame.calculateLottoCount(money);
// then
assertThat(lottoCount).isEqualTo(expectedLottoCount);
}
+
+ @Test
+ @DisplayName("๊ตฌ์
์ฅ์๋งํผ ๋ก๋ ํฐ์ผ์ ๋ก๋๊ฐ ์ถ๊ฐ๋๋ค๋ฉด ์ฑ๊ณต์ด๋ค.")
+ public void should_success_when_lotto_ticket_can_add_lottos_as_much_as_money() {
+ // given
+ int manualLottoCount = 1;
+
+ LottoGame lottoGame = new LottoGame();
+ int lottoCount = lottoGame.calculateLottoCount(3000);
+
+ List<LottoNumber> lottoNumbers = new ArrayList<>();
+ for (int i = 1; i < 7; i++) {
+ lottoNumbers.add(new LottoNumber(i));
+ }
+
+ List<Lotto> manualLotto = new ArrayList<>();
+ for (int i = 0; i < manualLottoCount; i++) {
+ manualLotto.add(new Lotto(lottoNumbers));
+ }
+
+ // when
+ LottoTicket lottoTicket = lottoGame.generateLottoTicket(manualLottoCount);
+
+ // then
+ assertThat(lottoTicket.getLottoTicket().size()).isEqualTo(lottoCount);
+ }
}
\ No newline at end of file | Java | @Bellroute ์ ํฌ๋ ์
๋ ฅ ๊ธ์ก๋งํผ ๋ก๋ ๋ฆฌ์คํธ๊ฐ ์ ์ถ๊ฐ๋๋์ง ํ
์คํธํ๋ ค๊ณ ์์ฑํ๋๋ฐ, ์ ์ด์ฃผ์ ๋ฆฌ๋ทฐ๋ฅผ ์ ์ดํดํ์ง ๋ชปํ ๊ฒ ๊ฐ์ต๋๋ค. ๋ถ์ฐ ์ค๋ช
๋ถํ๋๋ ค๋ ๋ ๊น์?? |
@@ -1,9 +1,14 @@
+import java.util.List;
import java.util.Scanner;
public class InputView {
private static final String INPUT_MONEY_MESSAGE = "๊ตฌ์
๊ธ์ก์ ์
๋ ฅํด ์ฃผ์ธ์.";
private static final String INPUT_WINNING_LOTTO_MESSAGE = "์ง๋ ์ฃผ ๋น์ฒจ ๋ฒํธ๋ฅผ ์
๋ ฅํด ์ฃผ์ธ์.";
+ private static final String MANUAL_LOTTO_COUNT_MESSAGE = "์๋์ผ๋ก ๊ตฌ๋งคํ ๋ก๋ ์๋ฅผ ์
๋ ฅํด ์ฃผ์ธ์.";
+ private static final String MANUAL_LOTTO_NUMBER_MESSAGE = "์๋์ผ๋ก ๊ตฌ๋งคํ ๋ฒํธ๋ฅผ ์
๋ ฅํด ์ฃผ์ธ์.";
+
+ private static final String INPUT_BONUS_NUMBER_MESSAGE = "๋ณด๋์ค ๋ณผ์ ์
๋ ฅํด ์ฃผ์ธ์.";
private static Scanner scanner = new Scanner(System.in);
@@ -12,6 +17,30 @@ public static int inputMoney() {
return Integer.parseInt(scanner.nextLine());
}
+ public static int manualLottoCount() {
+ System.out.println(MANUAL_LOTTO_COUNT_MESSAGE);
+ return Integer.parseInt(scanner.nextLine());
+ }
+
+ public static List<LottoNumber> manualLotto(int i, int manualLottoCount) {
+ if (i == 0) {
+ System.out.println(MANUAL_LOTTO_NUMBER_MESSAGE);
+ }
+
+ String inputs = scanner.nextLine();
+ if (i != manualLottoCount - 1) {
+ scanner.nextLine();
+ }
+
+ return StringParsingUtils.parseToLottoNumber(inputs);
+ }
+
+ public static BonusNumber inputBonusNumber() {
+ System.out.println(INPUT_BONUS_NUMBER_MESSAGE);
+ int bonusNumber = Integer.parseInt(scanner.nextLine());
+ return new BonusNumber(new LottoNumber(bonusNumber));
+ }
+
public static String inputWinningLottoNumber() {
System.out.println(INPUT_WINNING_LOTTO_MESSAGE);
return scanner.nextLine(); | Java | @Bellroute ๊ธฐ์กด์ ์ ํฌ๊ฐ ์์ฑํ ์ฝ๋๋ ์ง์ ํด์ฃผ์ ๊ฒ์ฒ๋ผ Lottoame ์ฑ
์์ InputView์์ ๋ถ์ฌํ๊ณ ์์ต๋๋ค. ์ด ๊ฒฝ์ฐ ๋ณ๊ฒฝ์ฌํญ์ด ์๊ธธ ๋, InputView์ Lotto๋ฅผ ์์ฑํ๋ LottoGame์ ๋ชจ๋ ์์ ํด์ผํฉ๋๋ค.
ํ์ธํด๋ณด๋ LottoGame์ ๊ธฐ์กด์ ์์ฑํด๋ Lotto ์์ฑ ๋ฉ์๋๋ฅผ ํ์ฉํด์ ๋ฆฌํํ ๋งํ์์ต๋๋ค. |
@@ -3,8 +3,10 @@ import { ParsedUrlQuery } from "querystring";
import { GetServerSideProps } from "next";
import { useState } from "react";
import { useQuery } from "@tanstack/react-query";
+import { getReviewStat, getReviews } from "@/lib/api/ReviewService";
import { getTrainerInfo } from "@/lib/api/trainerService";
import { getFavorite } from "@/lib/api/userService";
+import { ReviewResult } from "@/types/reviews";
import FindTrainerCard from "@/components/Cards/FindTrainerCard";
import { HorizontalLine } from "@/components/Common/Line";
import Loading from "@/components/Common/Loading";
@@ -38,6 +40,7 @@ export const getServerSideProps: GetServerSideProps = async (context) => {
export default function DetailTrainer({ trainerId }: { trainerId: string | null }) {
const [currentPage, setCurrentPage] = useState<number>(1);
+ const pageSize = 3;
const { data, isLoading, isError } = useQuery(
["trainer-detail", trainerId],
() => getTrainerInfo(trainerId as string),
@@ -46,22 +49,42 @@ export default function DetailTrainer({ trainerId }: { trainerId: string | null
},
);
+ const { data: reviewStat } = useQuery(["review-stat"], () => getReviewStat(trainerId as string), {
+ enabled: !!trainerId,
+ cacheTime: 5 * 60 * 1000,
+ staleTime: 5 * 60 * 1000,
+ });
+ const {
+ data: reviewList,
+ isLoading: isReviewLoading,
+ isError: isReviewError,
+ } = useQuery<ReviewResult>(
+ ["reviews", currentPage],
+ () => getReviews(trainerId as string, { page: currentPage, limit: pageSize }),
+ {
+ enabled: !!trainerId,
+ keepPreviousData: true,
+ },
+ );
+
const {
data: favoriteInfo,
isLoading: isFavoriteLoading,
isError: isFavoriteError,
} = useQuery(["favorite"], () => getFavorite(trainerId as string), { enabled: !!trainerId });
- if (isError || isFavoriteError) return <div>error!!</div>;
+ if (isError || isReviewError || isFavoriteError) return <div>error!!</div>;
const trainerInfo = data?.profile;
+ const reviews = reviewList?.reviews || [];
+ const totalCount = reviewList?.totalCount || 0;
return (
<div
className={clsx(
"relative flex flex-col justify-between gap-16 m-auto mt-[2.4rem] mb-16 px-8",
"pc:flex-row pc:gap-0 pc:mt-[5.6rem] pc:max-w-[144rem]",
- "tablet:max-w-[74.4rem] mobile:max-w-[37.5rem]",
+ "tablet:max-w-[74.4rem] mobile:max-w-auto",
)}
>
<div className={"flex flex-col gap-[2.4rem] w-full pc:gap-16 pc:pr-[10rem]"}>
@@ -73,8 +96,12 @@ export default function DetailTrainer({ trainerId }: { trainerId: string | null
<HorizontalLine width="100%" />
<TrainerInfo profile={trainerInfo} />
{/* ๋ฆฌ๋ทฐ ๋ฆฌ์คํธ api ์ฐ๊ฒฐํด์ผํจ */}
- <TrainerReview reviewList={trainerInfo} />
- <Pagination currentPage={currentPage} totalPages={5} onPageChange={setCurrentPage} />
+ <TrainerReview reviewList={reviews} reviewStat={reviewStat} totalCount={totalCount} />
+ <Pagination
+ currentPage={currentPage}
+ totalPages={Math.ceil(totalCount / pageSize)}
+ onPageChange={setCurrentPage}
+ />
</div>
<div className="flex flex-col gap-[2.4rem] pc:gap-16">
<TrainerControl profile={trainerInfo} />
@@ -83,7 +110,7 @@ export default function DetailTrainer({ trainerId }: { trainerId: string | null
<ShareSNS label="๋๋ง ์๊ธฐ์ ์์ฌ์ด ๊ฐ์ฌ๋์ธ๊ฐ์?" trainerInfo={trainerInfo} />
</div>
</div>
- {isLoading || (isFavoriteLoading && <Loading />)}
+ {(isLoading || isReviewLoading || isFavoriteLoading) && <Loading />}
</div>
);
} | Unknown | ```js
useQuery(["review-stat", trainerId],
() => getReviewStat(trainerId as string),
{ enabled: !!trainerId,
cacheTime: 5 * 60 * 1000,
staleTime: 5 * 60 * 1000 });
```
๋ก ํด์ฃผ์๋๊ฒ ์ข์๋ณด์ฌ์. |
@@ -3,8 +3,10 @@ import { ParsedUrlQuery } from "querystring";
import { GetServerSideProps } from "next";
import { useState } from "react";
import { useQuery } from "@tanstack/react-query";
+import { getReviewStat, getReviews } from "@/lib/api/ReviewService";
import { getTrainerInfo } from "@/lib/api/trainerService";
import { getFavorite } from "@/lib/api/userService";
+import { ReviewResult } from "@/types/reviews";
import FindTrainerCard from "@/components/Cards/FindTrainerCard";
import { HorizontalLine } from "@/components/Common/Line";
import Loading from "@/components/Common/Loading";
@@ -38,6 +40,7 @@ export const getServerSideProps: GetServerSideProps = async (context) => {
export default function DetailTrainer({ trainerId }: { trainerId: string | null }) {
const [currentPage, setCurrentPage] = useState<number>(1);
+ const pageSize = 3;
const { data, isLoading, isError } = useQuery(
["trainer-detail", trainerId],
() => getTrainerInfo(trainerId as string),
@@ -46,22 +49,42 @@ export default function DetailTrainer({ trainerId }: { trainerId: string | null
},
);
+ const { data: reviewStat } = useQuery(["review-stat"], () => getReviewStat(trainerId as string), {
+ enabled: !!trainerId,
+ cacheTime: 5 * 60 * 1000,
+ staleTime: 5 * 60 * 1000,
+ });
+ const {
+ data: reviewList,
+ isLoading: isReviewLoading,
+ isError: isReviewError,
+ } = useQuery<ReviewResult>(
+ ["reviews", currentPage],
+ () => getReviews(trainerId as string, { page: currentPage, limit: pageSize }),
+ {
+ enabled: !!trainerId,
+ keepPreviousData: true,
+ },
+ );
+
const {
data: favoriteInfo,
isLoading: isFavoriteLoading,
isError: isFavoriteError,
} = useQuery(["favorite"], () => getFavorite(trainerId as string), { enabled: !!trainerId });
- if (isError || isFavoriteError) return <div>error!!</div>;
+ if (isError || isReviewError || isFavoriteError) return <div>error!!</div>;
const trainerInfo = data?.profile;
+ const reviews = reviewList?.reviews || [];
+ const totalCount = reviewList?.totalCount || 0;
return (
<div
className={clsx(
"relative flex flex-col justify-between gap-16 m-auto mt-[2.4rem] mb-16 px-8",
"pc:flex-row pc:gap-0 pc:mt-[5.6rem] pc:max-w-[144rem]",
- "tablet:max-w-[74.4rem] mobile:max-w-[37.5rem]",
+ "tablet:max-w-[74.4rem] mobile:max-w-auto",
)}
>
<div className={"flex flex-col gap-[2.4rem] w-full pc:gap-16 pc:pr-[10rem]"}>
@@ -73,8 +96,12 @@ export default function DetailTrainer({ trainerId }: { trainerId: string | null
<HorizontalLine width="100%" />
<TrainerInfo profile={trainerInfo} />
{/* ๋ฆฌ๋ทฐ ๋ฆฌ์คํธ api ์ฐ๊ฒฐํด์ผํจ */}
- <TrainerReview reviewList={trainerInfo} />
- <Pagination currentPage={currentPage} totalPages={5} onPageChange={setCurrentPage} />
+ <TrainerReview reviewList={reviews} reviewStat={reviewStat} totalCount={totalCount} />
+ <Pagination
+ currentPage={currentPage}
+ totalPages={Math.ceil(totalCount / pageSize)}
+ onPageChange={setCurrentPage}
+ />
</div>
<div className="flex flex-col gap-[2.4rem] pc:gap-16">
<TrainerControl profile={trainerInfo} />
@@ -83,7 +110,7 @@ export default function DetailTrainer({ trainerId }: { trainerId: string | null
<ShareSNS label="๋๋ง ์๊ธฐ์ ์์ฌ์ด ๊ฐ์ฌ๋์ธ๊ฐ์?" trainerInfo={trainerInfo} />
</div>
</div>
- {isLoading || (isFavoriteLoading && <Loading />)}
+ {(isLoading || isReviewLoading || isFavoriteLoading) && <Loading />}
</div>
);
} | Unknown | ๋ต ์์ ํ๊ฒ ์ต๋๋ค! |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.