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.

Sign up for GitHub

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

Jump to bottom

Della - Pet Park Assignment #19

Open
wants to merge 9 commits into
base: main
Choose a base branch
from
Open

Della - Pet Park Assignment #19

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
70ca263
add contract, 9/14 tests passing
blackqueentech May 16, 2022
ceef751
add in logic for women cat for testing
blackqueentech May 17, 2022
dbbfe1b
11/14 passing, confused on ordering of logic
blackqueentech May 19, 2022
1597a1d
13/14 passing, zero value gender logic unclear
blackqueentech May 19, 2022
eeaaf60
13/14, female cat test issue
blackqueentech May 23, 2022
979503d
13/14, female 40 issues still
blackqueentech May 23, 2022
19a1686
13/14, invalid gender for female cat case
blackqueentech May 23, 2022
b3ef630
13/14 new if block, female test failing
blackqueentech May 24, 2022
87d2526
passing tests
blackqueentech May 25, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
123 changes: 121 additions & 2 deletions contracts/PetPark.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,126 @@
//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) {
Copy link
Contributor

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.

Copy link
Author

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?")

Copy link
Contributor

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 not if clause. Something like this

if (u.age != 0) { // If clause to check if the pet was already borrowed
  // All the conditions go here
}

revert("Invalid Age");
}

if (u.gender != _gender && _gender == Gender.Female) {
Copy link
Author

Choose a reason for hiding this comment

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

This is what is unclear to me. Zero value for enums is the first value, so the "default" gender is Male. I'm struggling to work that logic into the check for when a user hasn't borrowed any animals yet. This makes sense to me but it leads to the women <40 cat test failing.

Copy link

Choose a reason for hiding this comment

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

Instead of thinking of a negative test case, how would you write a condition for women under the age of 40 inside the if clause? And then lets if they are requesting a cat, if so then revert.

revert("Invalid Gender");
}

u.age = _age;
u.gender = _gender;

if (u.animal != AnimalType.None) {
revert("Already adopted a pet");
blackqueentech marked this conversation as resolved.
Show resolved Hide resolved
}

if (
u.gender == Gender.Female && _animal == AnimalType.Cat && u.age < 40
) {
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;
}
}
Loading