Adding UserMachineModel #58
Merged
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
eshaan7
reviewed
Apr 29, 2020
| @@ -43,7 +43,7 @@ $ black . | |||
| ``` | |||
|
|
|||
| ```bash | |||
| $ flake8 src/ ---max-line-length=88 --show-source --statistics | |||
| $ flake8 src/ --max-line-length=88 --show-source --statistics | |||
eshaan7
reviewed
Apr 29, 2020
src/FlaskRTBCTF/ctf/models.py
Outdated
| @@ -15,8 +16,20 @@ class Machine(db.Model): | |||
| ip = db.Column(db.String(64), nullable=False) | |||
| hardness = db.Column(db.String, nullable=False, default="Easy") | |||
|
|
|||
| users = db.relationship( | |||
There was a problem hiding this comment.
don't need this. It should be a one way relationship.
eshaan7
reviewed
Apr 29, 2020
src/FlaskRTBCTF/ctf/routes.py
Outdated
| @@ -128,6 +124,18 @@ def new_machine(): | |||
| new_machine = Machine() | |||
| form.populate_obj(new_machine) | |||
| db.session.add(new_machine) | |||
| db.session.flush() | |||
|
|
|||
| Users = User.query.all() | |||
There was a problem hiding this comment.
don't need to create this here.
eshaan7
reviewed
Apr 29, 2020
src/FlaskRTBCTF/users/routes.py
Outdated
| db.session.flush() | ||
|
|
||
| Machines = Machine.query.all() | ||
| for machine in Machines: |
There was a problem hiding this comment.
we don't need to initialize rows for every User & Machine. It would be created only when user submits flag, right or wrong.
eshaan7
reviewed
Apr 29, 2020
src/FlaskRTBCTF/users/routes.py
Outdated
|
|
||
| Machines = Machine.query.all() | ||
| for machine in Machines: | ||
| user_machine = UserMachine( |
eshaan7
reviewed
Apr 29, 2020
src/create_db.dev.py
Outdated
| @@ -56,6 +58,12 @@ | |||
| isAdmin=True, | |||
| ) | |||
| db.session.add(admin_user) | |||
| db.session.flush() | |||
|
|
|||
| admin_userMachine = UserMachine( | |||
There was a problem hiding this comment.
same as stated above. No need to initialize.
svensevenslow
force-pushed
the
caching-dev-issue17
branch
from
71be3f7 to
ce5e9c5
Compare
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.
Closes: #17
Changes Made
src/FlaskRTBCTF/ctf/routes.pyOther Information
flake8 src/ --max-line-length=88 --show-source --statisticsis throwing errors for src/FlaskRTBCTF/utils/init.py, which I assume can be ignoredflake8 src/ --max-line-length=88 --show-source --statisticsin CONTRIBUTING.md, I have corrected it for this branch atleastLet me know what you think @eshaan7