-
Notifications
You must be signed in to change notification settings - Fork 50
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
Della - Pet Park Assignment #19
Open
blackqueentech
wants to merge
9
commits into
DappCamp-Cohort-3:main
Choose a base branch
from
blackqueentech:della
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 7 commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
70ca263
add contract, 9/14 tests passing
blackqueentech ceef751
add in logic for women cat for testing
blackqueentech dbbfe1b
11/14 passing, confused on ordering of logic
blackqueentech 1597a1d
13/14 passing, zero value gender logic unclear
blackqueentech eeaaf60
13/14, female cat test issue
blackqueentech 979503d
13/14, female 40 issues still
blackqueentech 19a1686
13/14, invalid gender for female cat case
blackqueentech b3ef630
13/14 new if block, female test failing
blackqueentech 87d2526
passing tests
blackqueentech File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,124 @@ | ||
//SPDX-License-Identifier: Unlicense | ||
pragma solidity ^0.8.0; | ||
|
||
|
||
contract PetPark { | ||
address owner; | ||
|
||
enum AnimalType { | ||
None, | ||
Fish, | ||
Cat, | ||
Dog, | ||
Rabbit, | ||
Parrot | ||
} | ||
enum Gender { | ||
Male, | ||
Female | ||
} | ||
|
||
struct User { | ||
AnimalType animal; | ||
Gender gender; | ||
uint age; | ||
} | ||
|
||
mapping(AnimalType => uint) public animalCounts; | ||
mapping(address => User) public userInfo; | ||
|
||
event Added(AnimalType animal, uint count); | ||
event Borrowed(AnimalType animal); | ||
event Returned(AnimalType animal); | ||
|
||
constructor() { | ||
owner = msg.sender; | ||
} | ||
|
||
modifier onlyOwner() { | ||
require(owner == msg.sender, "Not an owner"); | ||
_; | ||
} | ||
|
||
modifier isOldEnough(uint age) { | ||
require(age != 0, "Invalid Age"); | ||
_; | ||
} | ||
|
||
modifier isValidAnimal(AnimalType animal) { | ||
require(animal != AnimalType.None, "Invalid animal"); | ||
_; | ||
} | ||
|
||
modifier isValidAnimalType(AnimalType animal) { | ||
require(animal != AnimalType.None, "Invalid animal type"); | ||
_; | ||
} | ||
|
||
modifier isAvailableAnimal(AnimalType animal) { | ||
require(animalCounts[animal] > 0, "Selected animal not available"); | ||
_; | ||
} | ||
|
||
function add(AnimalType _animal, uint _count) | ||
external | ||
onlyOwner | ||
isValidAnimal(_animal) | ||
{ | ||
animalCounts[_animal] = animalCounts[_animal] + _count; | ||
emit Added(_animal, animalCounts[_animal]); | ||
} | ||
|
||
function borrow( | ||
uint _age, | ||
Gender _gender, | ||
AnimalType _animal | ||
) | ||
external | ||
isOldEnough(_age) | ||
isValidAnimalType(_animal) | ||
isAvailableAnimal(_animal) | ||
{ | ||
User storage u = userInfo[msg.sender]; | ||
|
||
if (u.age != _age && u.age != 0) { | ||
revert("Invalid Age"); | ||
} | ||
|
||
if (u.gender != _gender) { | ||
revert("Invalid Gender"); | ||
} | ||
|
||
u.age = _age; | ||
u.gender = _gender; | ||
|
||
require(u.animal == AnimalType.None, "Already adopted a pet"); | ||
|
||
if (u.gender == Gender.Female && u.age < 40) { | ||
if (_animal == AnimalType.Cat) { | ||
revert("Invalid animal for women under 40"); | ||
} | ||
} | ||
|
||
if (u.gender == Gender.Male) { | ||
if (_animal != AnimalType.Fish && _animal != AnimalType.Dog) { | ||
revert("Invalid animal for men"); | ||
} | ||
} | ||
|
||
u.animal = _animal; | ||
uint count = animalCounts[_animal]; | ||
animalCounts[_animal] = count - 1; | ||
emit Borrowed(_animal); | ||
} | ||
|
||
} | ||
function giveBackAnimal() external { | ||
User storage u = userInfo[msg.sender]; | ||
if (u.animal == AnimalType.None) { | ||
revert("No borrowed pets"); | ||
} | ||
uint count = animalCounts[u.animal]; | ||
animalCounts[u.animal] = count + 1; | ||
emit Returned(u.animal); | ||
u.animal = AnimalType.None; | ||
} | ||
} |
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The age, gender and animal checks for the case when the pet was already borrowed, should be in a single if clause. Once you move them, all your tests will pass.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
How can you add them into one clause while keeping all the separate revert statements? ("Invalid Age", "Invalid Gender", "Already borrowed a pet?")
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
My bad.I meant
if block
notif clause
. Something like this