Skip to content
This repository was archived by the owner on Jan 14, 2020. It is now read-only.
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
18 changes: 18 additions & 0 deletions server/dapp/dapp.js
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,21 @@ function* receiveProject(userManager, projectManager, projectName) {
return result;
}

// function to reject the project
function* rejectProject(userManager, projectManager, projectName, buyerName) {
rest.verbose('dapp: rejectProject', projectName);

// get the accepted bid
const bid = yield projectManager.getAcceptedBid(projectName);

// get the buyer who create the project
const buyer = yield userManager.getUser(buyerName);

// change state of the project to REJECTED and transfer the bid funds to buyer itself after REJECTING the project
const result = yield projectManager.rejectProject(projectName, buyer.account, bid.address);
return result;
}

// handle project event
function* handleEvent(userManager, projectManager, args) {
const name = args.name;
Expand All @@ -154,6 +169,9 @@ function* handleEvent(userManager, projectManager, args) {
case ProjectEvent.RECEIVE:
return yield receiveProject(userManager, projectManager, args.projectName);

case ProjectEvent.REJECT:
return yield rejectProject(userManager, projectManager, args.projectName,args.username);

case ProjectEvent.ACCEPT:
return yield acceptBid(userManager, projectManager, args.username, args.password, args.bidId, args.projectName);

Expand Down
9 changes: 9 additions & 0 deletions server/lib/bid/contracts/Bid.sol
Original file line number Diff line number Diff line change
Expand Up @@ -52,4 +52,13 @@ contract Bid is ErrorCodes, BidState {
supplierAddress.send(amountWei-fee);
return ErrorCodes.SUCCESS;
}

function retrieve(address buyerAddress) returns (ErrorCodes) {
uint fee = 10000000 wei; // buyer absorbs the fee
uint amountWei = amount * 1 ether;

// transfer to buyer
buyerAddress.send(amountWei-fee);
return ErrorCodes.SUCCESS;
}
}
3 changes: 2 additions & 1 deletion server/lib/project/contracts/ProjectEvent.sol
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ contract ProjectEvent {
NULL,
ACCEPT,
DELIVER,
RECEIVE
RECEIVE,
REJECT
}
}
14 changes: 14 additions & 0 deletions server/lib/project/contracts/ProjectManager.sol
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,18 @@ contract ProjectManager is ErrorCodes, Util, ProjectState, ProjectEvent, BidStat
return bid.settle(supplierAddress);
}

function rejectProject(string name, address buyerAddress, address bidAddress) returns (ErrorCodes) {
// validate for the existence of the project
if (!exists(name)) return (ErrorCodes.NOT_FOUND);
// set project state
address projectAddress = getProject(name);
var (errorCode, state) = handleEvent(projectAddress, ProjectEvent.REJECT);
if (errorCode != ErrorCodes.SUCCESS) return errorCode;
// settle bid funds back to the buyer
Bid bid = Bid(bidAddress);
return bid.retrieve(buyerAddress);
}

/**
* handleEvent - transition project to a new state based on incoming event
*/
Expand Down Expand Up @@ -133,6 +145,8 @@ contract ProjectManager is ErrorCodes, Util, ProjectState, ProjectEvent, BidStat
if (state == ProjectState.INTRANSIT) {
if (projectEvent == ProjectEvent.RECEIVE)
return (ErrorCodes.SUCCESS, ProjectState.RECEIVED);
if (projectEvent == ProjectEvent.REJECT)
return (ErrorCodes.SUCCESS, ProjectState.REJECTED);
}
return (ErrorCodes.ERROR, state);
}
Expand Down
3 changes: 2 additions & 1 deletion server/lib/project/contracts/ProjectState.sol
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ contract ProjectState {
OPEN,
PRODUCTION,
INTRANSIT,
RECEIVED
RECEIVED,
REJECTED
}
}
19 changes: 19 additions & 0 deletions server/lib/project/projectManager.js
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,9 @@ function setContract(admin, contract) {
contract.settleProject = function* (projectName, supplierAddress, bidAddress) {
return yield settleProject(admin, contract, projectName, supplierAddress, bidAddress);
}
contract.rejectProject = function* (projectName, buyerAddress, bidAddress) {
return yield rejectProject(admin, contract, projectName, buyerAddress, bidAddress);
}
contract.getAcceptedBid = getAcceptedBid;

return contract;
Expand Down Expand Up @@ -208,6 +211,22 @@ function* settleProject(admin, contract, projectName, supplierAddress, bidAddres
}
}

function* rejectProject(admin, contract, projectName, buyerAddress, bidAddress) {
rest.verbose('rejectProject', {projectName, buyerAddress, bidAddress});
const method = 'rejectProject';
const args = {
name: projectName,
buyerAddress: buyerAddress,
bidAddress: bidAddress,
};

const result = yield rest.callMethod(admin, contract, method, args);
const errorCode = parseInt(result[0]);
if (errorCode != ErrorCodes.SUCCESS) {
throw new Error(errorCode);
}
}

function* getBid(bidId) {
rest.verbose('getBid', bidId);
return (yield rest.waitQuery(`Bid?id=eq.${bidId}`,1))[0];
Expand Down
Loading