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

Della - Pet Park Assignment #19

Open
wants to merge 9 commits into
base: main
Choose a base branch
from
Open
121 changes: 119 additions & 2 deletions contracts/PetPark.sol
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) {
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) {
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;
}
}
Loading