Skip to content

#161869316 update tests cases to pass #20

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

Open
Joyce-O wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

#161869316 update tests cases to pass #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions server/controllers/placeOrderController.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ class placeOrderHandler {
const presentLocation = "Jos";
const total = (quantity * price) + parcelTypeCost(parcelType);
const status = 'pending';
const id = placeOrders.length;
const id = placeOrder.length;
const trackingID = uuidv5(`${senderName}${new Date()}${id}`, uuidv5.URL)
const sendOrder = {
email,
Expand All @@ -55,8 +55,8 @@ class placeOrderHandler {
placeOrder.push(sendOrder);
return response.status(201)
.json({
message: "Your delivery order is booked successfully",
sendOrder
message: "Your delivery order is booked successfully"
// sendOrder
});
}

Expand Down
22 changes: 3 additions & 19 deletions server/middlewares/placeOrderValidator.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ class placeOrderValidators {
if (!validEmail.test(email)) {
return response.status(400)
.json({
status: "!Unsuccessful",
status: "Unsuccessful!",
message: "You are sending invalid email format"
});
}
Expand Down Expand Up @@ -167,7 +167,7 @@ class placeOrderValidators {
}

weight = parseFloat(weight);
if (weight < 0 || weight > 1000) {
if (weight <= 0 || weight > 1000) {
return response.status(400)
.json({
status: "Unsuccessful!",
Expand Down Expand Up @@ -269,7 +269,7 @@ class placeOrderValidators {
});
}

if (quantity.length < 1 || quantity.length > 2) {
if (quantity.length > 2) {
return response.status(400)
.json({
status: "Unsuccessful!",
Expand Down Expand Up @@ -302,15 +302,6 @@ class placeOrderValidators {
message: "Wrong format, please enter parcelType as 'delicate' or 'non-delicate'"
});
}

if (parcelType.length < 8 || parcelType.length > 11) {
return response.status(400)
.json({
status: "Unsuccessful!",
message: "parcelType should be 8 to 12 characters long"
});
}

request.body.senderName = senderName;
request.body.receiverName = receiverName
request.body.senderPhone = senderPhone;
Expand Down Expand Up @@ -343,13 +334,6 @@ class placeOrderValidators {

static getSpecificOrderValidator(request, response, next) {
let {parcelId} = request.params;
if (!(parcelId)) {
return response.status(400)
.json({
status: 'Unsuccessful!',
message: 'Sorry! this is an invalid URL'
});
}
const isExistOrder = placeOrder.find(placeOrder => placeOrder.trackingID === (parcelId));
if (!isExistOrder) {
return response.status(404)
Expand Down
Loading