Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. Weโ€™ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/jaino/#95 #121

Merged
merged 18 commits into from
Feb 13, 2024
Merged

Feature/jaino/#95 #121

merged 18 commits into from
Feb 13, 2024

Conversation

jeongjaino
Copy link
Member

1. ๐Ÿ“„ ๊ด€๋ จ๋œ ์ด์Šˆ ๋ฐ ์†Œ๊ฐœ

#95 ์„ค๋ฌธ ๋“ฑ๋ก ๋ฐ ์ž‘์„ฑ์‹œ ์ด์ „ ์ •๋ณด ์ˆ˜์ • ๊ธฐ๋Šฅ ๊ตฌํ˜„

2. ๐Ÿ”ฅ ๋ณ€๊ฒฝ๋œ ์ 

์„ค๋ฌธ ์ž‘์„ฑ ์‹œ ์ด์ „ ์„ค๋ฌธ ํ•ญ๋ชฉ์œผ๋กœ ๋Œ์•„๊ฐˆ ์ˆ˜ ์žˆ์Œ.
์งˆ๋ฌธ ๋ชฉ๋ก ์ž‘์„ฑ ์‹œ, ์ด์ „ ์งˆ๋ฌธ ์ดํ›„ ์งˆ๋ฌธ์œผ๋กœ ๋Œ์•„๊ฐˆ ์ˆ˜ ์žˆ์Œ.

3. โœ… ๊ผญ ํ™•์ธํ•ด์คฌ์œผ๋ฉด ํ•˜๋Š” ๋ถ€๋ถ„

ํƒœ๊ทœ๋‹˜ ๋ถ€๋ถ„ management-event ๋ถ€๋ถ„์€ ๋‹ค์Œ ํ”ผ์•Œ๋กœ ๋„˜๊ธธ๊ฒŒ์š”.. ๋ณ€๊ฒฝ ๋‚ด์šฉ์ด ๋„ˆ๋ฌด ๋งŽ์•„์„œ ๋‚˜๋ˆ ์•ผ ํ•  ๊ฒƒ ๊ฐ™์•„์„œ์š”

์ผ๋‹จ ์ œ๊ฐ€ ํ•  ์ˆ˜ ์žˆ๋Š” ํ…Œ์ŠคํŠธ๋Š” ๋‹ค ํ•ด๋ณธ๊ฒƒ ๊ฐ™์€๋ฐ,,
๋ฒ„๊ทธ ์ƒ๊ธฐ๋ฉด ๊ณต์œ  ๋ถ€ํƒ๋“œ๋ ค์š” ์บฌ์บฌ

SurveyFormRegistrationScreen , SurveyFormEditScreen ๋ชจ๋‘ ๋กœ์ง ๋™์ผํ•ฉ๋‹ˆ๋‹ค. (์ˆ˜์ • ์‹œ ๋ฐ์ดํ„ฐ ๋กœ๋“œํ•˜๋Š” ๋กœ์ง ์ œ์™ธ)

์ฃผ์š” ๋กœ์ง

onNextQuestionButtonClicked = { // '>' ๋ฒ„ํŠผ
                    if (viewModel.validateSurveyForm(SurveyFormState.QUESTION).not()) {
                        return@SurveyFormContent
                    }

                    viewModel.editSurveyQuestion() // ๋‹ต๋ณ€ ์ˆ˜์ •

                    viewModel.setNextQuestionNumber() // ๋‹ค์Œ ์งˆ๋ฌธ ๋ถˆ๋Ÿฌ์˜ค๊ธฐ
                    viewModel.setQuestion()
                },
                onPreviousQuestionButtonClicked = { // '<' ๋ฒ„ํŠผ
                    if (viewModel.validateSurveyForm(SurveyFormState.QUESTION).not()) {
                        return@SurveyFormContent
                    }

                    // ๋‹ค๋ฅธ ์งˆ๋ฌธ์œผ๋กœ ๋„˜์–ด๊ฐ€๊ธฐ ์ „, ์งˆ๋ฌธ ์ถ”๊ฐ€ ํ˜น์€ ์ €์žฅ
                    if (currentQuestionNumber == questionList.size) {
                        viewModel.addSurveyQuestion()
                    } else {
                        viewModel.editSurveyQuestion()
                    }

                    viewModel.setPreviousQuestionNumber() // ์ด์ „ ์งˆ๋ฌธ ๋ถˆ๋Ÿฌ์˜ค๊ธฐ
                    viewModel.setQuestion()
                },
                onAddQuestionButtonClicked = { // ๋ฌธํ•ญ ์ถ”๊ฐ€ ๋ฒ„ํŠผ
                    if (viewModel.validateSurveyForm(SurveyFormState.QUESTION).not()) {
                        return@SurveyFormContent
                    }

                    if (currentQuestionNumber == questionList.size) {
                        viewModel.addSurveyQuestion() // ์งˆ๋ฌธ ์ถ”๊ฐ€
                    } else {
                        viewModel.editSurveyQuestion()
                    }

                    viewModel.setLastQuestion()
                },
                onDateChanged = viewModel::setSurveyDateDeadline,
                onTimeChanged = { localTime -> viewModel.setSurveyTimeDeadline(localTime) },
                onPreviousButtonClicked = { previousState -> // ์ด์ „ ๋ฒ„ํŠผ
                    if (previousState == SurveyFormState.QUESTION) {
                        viewModel.setSurveyQuestionFromQuestionList()
                    }

                    viewModel.setSurveyFormState(previousState)
                },
                onNextButtonClicked = { currentState, nextState -> // ๋‹ค์Œ ๋ฒ„ํŠผ
                    if (viewModel.validateSurveyForm(currentState).not()) {
                        return@SurveyFormContent
                    }

                    if (currentState == SurveyFormState.QUESTION) {
                        if (currentQuestionNumber == questionList.size) { // ๋งˆ์ง€๋ง‰ ์งˆ๋ฌธ์ธ ๊ฒฝ์šฐ
                            viewModel.addSurveyQuestion()
                        } else {
                            viewModel.editSurveyQuestion()
                        }
                    }

                    viewModel.setSurveyFormState(nextState)
                },
  1. onNextQuestionButtonClicked
  • ๋‹ค์Œ ์งˆ๋ฌธ ๋ถˆ๋Ÿฌ์˜ค๋Š” ๋ฒ„ํŠผ '>' ๋ฒ„ํŠผ
  • ๊ธฐ์กด ๋‹ต๋ณ€ ์ˆ˜์ • ํ›„ ๋‹ค์Œ ์งˆ๋ฌธ ๋ถˆ๋Ÿฌ์˜ค๊ธฐ
  1. onPreviousQuestionButtonClicked
  • ์ด์ „ ์งˆ๋ฌธ ๋ถˆ๋Ÿฌ์˜ค๋Š” ๋ฒ„ํŠผ '<' ๋ฒ„ํŠผ
  • ํ˜„์žฌ ์งˆ๋ฌธ ๋ฒˆํ˜ธ(0๋ถ€ํ„ฐ ์‹œ์ž‘)๊ฐ€, ์ €์žฅ๋œ ์งˆ๋ฌธ ๋ชฉ๋ก์˜ ํฌ๊ธฐ์™€ ๊ฐ™์€ ๊ฒฝ์šฐ
    • ์ž‘์„ฑํ•œ ์งˆ๋ฌธ ๋ชฉ๋ก์— ์ž‘์„ฑํ•œ ์งˆ๋ฌธ ์ถ”๊ฐ€
  • else ๋‚˜๋จธ์ง€์˜ ๊ฒฝ์šฐ
    • ํ˜„์žฌ ์งˆ๋ฌธ ๋‚ด์šฉ ์ˆ˜์ •
  1. onAddQuestionButtonClicked
  • ํ•ญ๋ชฉ ์ถ”๊ฐ€ ๋ฒ„ํŠผ
  • ๋งŒ์•ฝ ํ˜„์žฌ ์งˆ๋ฌธ ๋ฒˆํ˜ธ๊ฐ€ ์ €์žฅ๋œ ์งˆ๋ฌธ ๋ชฉ๋ก์˜ ํฌ๊ธฐ์™€ ๊ฐ™์€ ๊ฒฝ์šฐ (์œ„์˜ ์กฐ๊ฑด๊ณผ ๋™์ผ, ๋งˆ์ง€๋ง‰ ์งˆ๋ฌธ์ž„์„ ์˜๋ฏธ)
    • ํ˜„์žฌ ์งˆ๋ฌธ ์ถ”๊ฐ€
  • ์•„๋‹Œ ๊ฒฝ์šฐ ํ˜„์žฌ ์งˆ๋ฌธ ๋‚ด์šฉ ์ˆ˜์ •
  • viewModel.setLastQuestion() -> ๊ฐ€์žฅ ๋งˆ์ง€๋ง‰ ๋ฒˆํ˜ธ๋กœ ์ด๋™, ์˜ˆ๋ฅผ ๋“ค์–ด 2/5์—์„œ ํ•ญ๋ชฉ ์ถ”๊ฐ€๋ฅผ ๋ˆ„๋ฅด๋ฉด 6/6์œผ๋กœ ์ด๋™
  1. ๋กœ์ง ์Šฅ ๋ณด์ด์ฃ  ?>
    ์งˆ๋ฌธ ๋Œ€ ํ™˜ ์˜ ์บฌ์บฌ

4. ๐Ÿ“ธ ์Šคํฌ๋ฆฐ์ƒท(์„ ํƒ)

image

5. ๐Ÿ’ก์•Œ๊ฒŒ๋œ ํ˜น์€ ๊ถ๊ธˆํ•œ ์‚ฌํ•ญ๋“ค

๊ณ ๋„์˜ ์„ค๋ฌธ ์งˆ๋ฌธ ์•Œ๊ณ ๋ฆฌ์ฆ˜

@jeongjaino jeongjaino added ๐Ÿš€์ง„ํ˜ธ๐Ÿš€ ESTP ์ •์ง„ํ˜ธ 23์„ธ ๐ŸŒฑ๊ธฐ๋Šฅ๐ŸŒฑ ์ƒˆ๋กœ์šด ๊ธฐ๋Šฅ ๋‘๋‘๋‘ฅ์žฅ! ๐Ÿ”ฅ๋ฆฌ๋ทฐ ๊ธฐ๋‹ค๋ฆฌ๋Š” ์ค‘๐Ÿ”ฅ PR์„ ์˜ฌ๋ฆฌ๊ณ  ์ฝ”๋“œ๋ฆฌ๋ทฐ๋ฅผ ๊ธฐ๋‹ค๋ฆฌ๊ณ  ์žˆ๋Š” ์ƒํƒœ์ž…๋‹ˆ๋‹ค. labels Feb 6, 2024
@jeongjaino jeongjaino self-assigned this Feb 6, 2024
@jeongjaino jeongjaino closed this Feb 6, 2024
@jeongjaino jeongjaino reopened this Feb 6, 2024
Copy link
Member

@tgyuuAn tgyuuAn left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

์ง„ํ˜ธ์ƒ LGTM ์ž…๋‹ˆ๋‹ค.

๊ทธ ๋•Œ ๊ฐ™์ด ๊ณ ๋ฏผํ–ˆ๋˜ ๊ฑฐ๊ธฐ๋„ ํ•˜๊ณ  ๋กœ์ง์ด ๋„ˆ๋ฌด ๋งŽ์•„์„œ ์ง„ํ˜ธ์ƒํ•œํ…Œ ๋‹ค ๋งก๊ฒจ์•ผ ํ•  ๊ฒƒ ๊ฐ™์•„์š”

์ปจ๋ฒค์…˜์ด๋‚˜ ํ•จ์ˆ˜ ๋ถ„๋ฆฌ, ๋„ค์ด๋ฐ ๊ฐ™์€ ๊ฒƒ๋“ค ๋ถ€๋ถ„์—์„œ๋Š” ์ด์ƒํ•œ ๋ถ€๋ถ„์ด ์ „ํ˜€ ์—†์—ˆ์–ด์š”.

Conflict๋‚œ ๋ถ€๋ถ„๋งŒ ํ•ด๊ฒฐํ•ด์ฃผ์‹œ๊ณ  ๋จธ์ง€ํ•ด์ฃผ์‹œ๋ฉด ๋  ๊ฒƒ ๊ฐ™์•„์š”...!

@tgyuuAn tgyuuAn added ๐ŸŒŸ๋จธ์ง€ ํ•ด์ฃผ์„ธ์š”๐ŸŒŸ ์ฝ”๋“œ ๋ฆฌ๋ทฐ๊ฐ€ ์™„๋ฃŒ๋œ ๋’ค PR์„ ์˜ฌ๋ฆฐ์‚ฌ๋žŒ์ด Merge๋ฅผ ํ•˜๋ฉด ๋˜๋Š” ๋‹จ๊ณ„์ž…๋‹ˆ๋‹ค. and removed ๐Ÿ”ฅ๋ฆฌ๋ทฐ ๊ธฐ๋‹ค๋ฆฌ๋Š” ์ค‘๐Ÿ”ฅ PR์„ ์˜ฌ๋ฆฌ๊ณ  ์ฝ”๋“œ๋ฆฌ๋ทฐ๋ฅผ ๊ธฐ๋‹ค๋ฆฌ๊ณ  ์žˆ๋Š” ์ƒํƒœ์ž…๋‹ˆ๋‹ค. labels Feb 7, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
๐ŸŒŸ๋จธ์ง€ ํ•ด์ฃผ์„ธ์š”๐ŸŒŸ ์ฝ”๋“œ ๋ฆฌ๋ทฐ๊ฐ€ ์™„๋ฃŒ๋œ ๋’ค PR์„ ์˜ฌ๋ฆฐ์‚ฌ๋žŒ์ด Merge๋ฅผ ํ•˜๋ฉด ๋˜๋Š” ๋‹จ๊ณ„์ž…๋‹ˆ๋‹ค. ๐ŸŒฑ๊ธฐ๋Šฅ๐ŸŒฑ ์ƒˆ๋กœ์šด ๊ธฐ๋Šฅ ๋‘๋‘๋‘ฅ์žฅ! ๐Ÿš€์ง„ํ˜ธ๐Ÿš€ ESTP ์ •์ง„ํ˜ธ 23์„ธ
Projects
None yet
2 participants