diff --git a/contracts/EventManager.sol b/contracts/EventManager.sol index 68e2535..7c0894e 100644 --- a/contracts/EventManager.sol +++ b/contracts/EventManager.sol @@ -27,7 +27,8 @@ contract EventManager { uint256 capacity; uint256 ticketsSold; uint256 ticketPrice; // in USD cents - uint256 eventDate; + uint256 eventStartDate; + uint256 eventEndDate; string[] images; // array of image URLs uint256[] tickets; address payable eventHost; @@ -39,7 +40,7 @@ contract EventManager { uint256 eventId; } - event EventCreated(uint256 eventId, string name, uint256 eventDate); + event EventCreated(uint256 eventId, string name, uint256 eventStartDate); event TicketPurchased(uint256 ticketId, uint256 eventId, address buyer, uint256 price); event TicketTransferred(uint256 ticketId, address from, address to); event TicketTransferApproved(uint256 ticketId, address owner, address trustee); @@ -91,10 +92,10 @@ contract EventManager { return centsToFlare(events[_eventId].ticketPrice); } - function createEvent(string memory _name, string memory _description, string memory _location, uint256 _capacity, uint256 _ticketPrice, uint256 _eventDate, string[] memory _images) public returns (uint256 _eventId) { - events[eventCounter] = Event(_name, _description, _location, _capacity, 0, _ticketPrice, _eventDate, _images, new uint256[](0), payable(msg.sender)); + function createEvent(string memory _name, string memory _description, string memory _location, uint256 _capacity, uint256 _ticketPrice, uint256 _eventStartDate, uint256 _eventEndDate, string[] memory _images) public returns (uint256 _eventId) { + events[eventCounter] = Event(_name, _description, _location, _capacity, 0, _ticketPrice, _eventStartDate, _eventEndDate, _images, new uint256[](0), payable(msg.sender)); eventCounter++; - emit EventCreated(eventCounter - 1, _name, _eventDate); + emit EventCreated(eventCounter - 1, _name, _eventStartDate); return eventCounter - 1; } @@ -110,7 +111,7 @@ contract EventManager { function buyTicket(uint256 _eventId) public payable returns (uint256 _ticketId) { require(_eventId < eventCounter, "Invalid event ID"); - require(events[_eventId].eventDate > block.timestamp, "Event has already passed"); + require(events[_eventId].eventStartDate > block.timestamp, "Event has already passed"); require(events[_eventId].tickets.length < events[_eventId].capacity, "Event is full"); uint256 ticketCost = getEventPriceFlare(_eventId); // Get ticket price in FLR @@ -143,7 +144,7 @@ contract EventManager { function transferTicketForce(uint256 _ticketId, address _to) private { require(_ticketId < ticketCounter, "Invalid ticket ID"); - require(events[tickets[_ticketId].eventId].eventDate > block.timestamp, "Event has already passed"); + require(events[tickets[_ticketId].eventId].eventStartDate > block.timestamp, "Event has already passed"); address prevHolder = tickets[_ticketId].holder; diff --git a/test/EventManager.test.ts b/test/EventManager.test.ts index 975d3fa..884d31b 100644 --- a/test/EventManager.test.ts +++ b/test/EventManager.test.ts @@ -14,7 +14,8 @@ describe('EventManager', function () { const EVENT_LOCATION = 'London, UK'; const EVENT_CAPACITY = 100; const EVENT_TICKET_PRICE = 1000; // 10 USD in cents - const EVENT_DATE = Math.floor(Date.now() / 1000) + 86400; // 1 day from now + const EVENT_START_DATE = Math.floor(Date.now() / 1000) + 86400; // 1 day from now + const EVENT_END_DATE = Math.floor(Date.now() / 1000) + 172800; // 2 days from now const EVENT_IMAGES = ['image1.jpg', 'image2.jpg']; beforeEach(async function () { @@ -32,7 +33,8 @@ describe('EventManager', function () { EVENT_LOCATION, EVENT_CAPACITY, EVENT_TICKET_PRICE, - EVENT_DATE, + EVENT_START_DATE, + EVENT_END_DATE, EVENT_IMAGES ); } @@ -47,7 +49,8 @@ describe('EventManager', function () { expect(event.location).to.equal(EVENT_LOCATION); expect(event.capacity).to.equal(EVENT_CAPACITY); expect(event.ticketPrice).to.equal(EVENT_TICKET_PRICE); - expect(event.eventDate).to.equal(EVENT_DATE); + expect(event.eventStartDate).to.equal(EVENT_START_DATE); + expect(event.eventEndDate).to.equal(EVENT_END_DATE); expect(event.eventHost).to.equal(owner.address); });