Sourcery refactored master branch #6
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
![sourcery-ai[bot]](https://avatars.githubusercontent.com/in/48477?s=60&v=4){kind=small}
Comment on lines
-69
to
+74
| if question_type == 'shortanswer' or question_type == 'numerical' or question_type == 'multichoice' or question_type == 'truefalse': | ||
| if question_type in [ | ||
| 'shortanswer', | ||
| 'numerical', | ||
| 'multichoice', | ||
| 'truefalse', | ||
| ]: |
There was a problem hiding this comment.
Function AnswersDB.add_user_answer refactored with the following changes:
- Replace multiple comparisons of same variable with
inoperator [×2] (merge-comparisons) - Merge else clause's nested if statement into elif (
merge-else-if-into-elif) - Replace if statement with if expression (
assign-if-exp)
This removes the following comments ( why? ):
# если пользователь не отпралял этот вариант ответа
Comment on lines
-179
to
+246
| if await AnswersDB.find_question_by_ans(conn, question, answer, session) is None: | ||
| return await conn[DATABASE_NAME][QUESTIONS_COLLECTION_NAME].find_one_and_update( | ||
| return ( | ||
| await conn[DATABASE_NAME][ | ||
| QUESTIONS_COLLECTION_NAME | ||
| ].find_one_and_update( | ||
| {'question': question}, | ||
| {'$push': {'answers': {'answer': answer, 'users': [], 'correct': [ | ||
| user_info], 'not_correct': []}}}, {"_id": 0}, | ||
| return_document=ReturnDocument.AFTER, session=session | ||
| ) | ||
| else: | ||
| return await conn[DATABASE_NAME][QUESTIONS_COLLECTION_NAME].find_one_and_update( | ||
| {'question': question, 'answers.answer': answer}, | ||
| {'$push': {'answers.$.correct': user_info}}, {"_id": 0}, | ||
| return_document=ReturnDocument.AFTER, session=session | ||
| { | ||
| '$push': { | ||
| 'answers': { | ||
| 'answer': answer, | ||
| 'users': [], | ||
| 'correct': [user_info], | ||
| 'not_correct': [], | ||
| } | ||
| } | ||
| }, | ||
| {"_id": 0}, | ||
| return_document=ReturnDocument.AFTER, | ||
| session=session, | ||
| ) | ||
| else: | ||
| if await AnswersDB.find_question_by_ans(conn, question, answer, session) is None: | ||
| return await conn[DATABASE_NAME][QUESTIONS_COLLECTION_NAME].find_one_and_update( | ||
| {'question': question}, | ||
| {'$push': {'answers': {'answer': answer, 'users': [], | ||
| 'correct': [], 'not_correct': [user_info]}}}, {"_id": 0}, | ||
| return_document=ReturnDocument.AFTER, session=session | ||
| if await AnswersDB.find_question_by_ans( | ||
| conn, question, answer, session | ||
| ) | ||
| else: | ||
| return await conn[DATABASE_NAME][QUESTIONS_COLLECTION_NAME].find_one_and_update( | ||
| is None | ||
| else await conn[DATABASE_NAME][ | ||
| QUESTIONS_COLLECTION_NAME | ||
| ].find_one_and_update( | ||
| {'question': question, 'answers.answer': answer}, | ||
| {'$push': {'answers.$.not_correct': user_info}}, {"_id": 0}, | ||
| return_document=ReturnDocument.AFTER, session=session | ||
| {'$push': {'answers.$.correct': user_info}}, | ||
| {"_id": 0}, | ||
| return_document=ReturnDocument.AFTER, | ||
| session=session, | ||
| ) | ||
| ) | ||
|
|
||
| if await AnswersDB.find_question_by_ans(conn, question, answer, session) is None: | ||
| return await conn[DATABASE_NAME][QUESTIONS_COLLECTION_NAME].find_one_and_update( | ||
| {'question': question}, | ||
| {'$push': {'answers': {'answer': answer, 'users': [], | ||
| 'correct': [], 'not_correct': [user_info]}}}, {"_id": 0}, | ||
| return_document=ReturnDocument.AFTER, session=session | ||
| ) | ||
| else: | ||
| return await conn[DATABASE_NAME][QUESTIONS_COLLECTION_NAME].find_one_and_update( | ||
| {'question': question, 'answers.answer': answer}, | ||
| {'$push': {'answers.$.not_correct': user_info}}, {"_id": 0}, | ||
| return_document=ReturnDocument.AFTER, session=session | ||
| ) |
There was a problem hiding this comment.
Function AnswersDB.add_user_approve refactored with the following changes:
- Remove unnecessary else after guard condition (
remove-unnecessary-else) - Replace if statement with if expression (
assign-if-exp)
Comment on lines
-222
to
+270
| if user_info not in question_db['viewers']: | ||
| document = await conn[DATABASE_NAME][QUESTIONS_COLLECTION_NAME].find_one_and_update( | ||
| {'question': question}, { | ||
| '$push': {'viewers': user_info}}, | ||
| {"_id": 0}, return_document=ReturnDocument.AFTER, session=session | ||
| ) | ||
| return document | ||
| else: | ||
| if user_info in question_db['viewers']: | ||
| return question_db | ||
| document = await conn[DATABASE_NAME][QUESTIONS_COLLECTION_NAME].find_one_and_update( | ||
| {'question': question}, { | ||
| '$push': {'viewers': user_info}}, | ||
| {"_id": 0}, return_document=ReturnDocument.AFTER, session=session | ||
| ) | ||
| return document |
There was a problem hiding this comment.
Function AnswersDB.add_new_viewer refactored with the following changes:
- Swap if/else branches (
swap-if-else-branches) - Remove unnecessary else after guard condition (
remove-unnecessary-else)
Comment on lines
-245
to
-252
| if answer_['subquestion'] == answer[0] and answer_['answer'] == answer[1]: | ||
| if user_info in answer_['users']: | ||
| if ( | ||
| answer_['subquestion'] == answer[0] | ||
| and answer_['answer'] == answer[1] | ||
| and user_info in answer_['users'] | ||
| ): | ||
| return True | ||
| elif answer_['answer'] == answer: | ||
| for user in answer_['users']: | ||
| if user == user_info: | ||
| return True | ||
| else: | ||
| if answer_['answer'] == answer: | ||
| for user in answer_['users']: | ||
| if user == user_info: | ||
| return True |
There was a problem hiding this comment.
Function AnswersDB.is_user_send_answer refactored with the following changes:
- Merge else clause's nested if statement into elif (
merge-else-if-into-elif) - Merge nested if conditions (
merge-nested-ifs)
Comment on lines
-155
to
+156
| if isinstance(data['answer'], list): | ||
| if len(data['answer']) == 2: | ||
| data['answer'] = 0 | ||
| if isinstance(data['answer'], list) and len(data['answer']) == 2: | ||
| data['answer'] = 0 |
There was a problem hiding this comment.
Function add_approve refactored with the following changes:
- Merge nested if conditions (
merge-nested-ifs)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Branch
masterrefactored by Sourcery.If you're happy with these changes, merge this Pull Request using the Squash and merge strategy.
See our documentation here.
Run Sourcery locally
Reduce the feedback loop during development by using the Sourcery editor plugin:
Review changes via command line
To manually merge these changes, make sure you're on the
masterbranch, then run:Help us improve this pull request!