Skip to content

Ht 27 mismatch between the bill filter and the number of bills on the page identifier #17

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

Merged
Lenton99 merged 4 commits into from
Feb 10, 2022
Merged

Ht 27 mismatch between the bill filter and the number of bills on the page identifier #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
18f168a
HT-27 Fixed the pagination issues
Lenton99 Feb 10, 2022
212e1f7
Merge branch 'develop' of https://github.com/jarrodback/CSSD-Assignme…
Lenton99 Feb 10, 2022
0fc796c
HT-27 Fixed server tests
Lenton99 Feb 10, 2022
b5f541c
HT-27 Fixed UI tests
Lenton99 Feb 10, 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
2 changes: 1 addition & 1 deletion server/.nyc_output/processinfo/index.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"processes":{"076bf10b-2570-48ae-ba89-4c94269b643b":{"parent":null,"children":[]}},"files":{"E:\\UniWork\\CSSD\\CSSD-Assignment\\server\\app.js":["076bf10b-2570-48ae-ba89-4c94269b643b"],"E:\\UniWork\\CSSD\\CSSD-Assignment\\server\\database\\index.js":["076bf10b-2570-48ae-ba89-4c94269b643b"],"E:\\UniWork\\CSSD\\CSSD-Assignment\\server\\config\\db.config.js":["076bf10b-2570-48ae-ba89-4c94269b643b"],"E:\\UniWork\\CSSD\\CSSD-Assignment\\server\\models\\journey.model.js":["076bf10b-2570-48ae-ba89-4c94269b643b"],"E:\\UniWork\\CSSD\\CSSD-Assignment\\server\\models\\bill.model.js":["076bf10b-2570-48ae-ba89-4c94269b643b"],"E:\\UniWork\\CSSD\\CSSD-Assignment\\server\\utilities.js":["076bf10b-2570-48ae-ba89-4c94269b643b"],"E:\\UniWork\\CSSD\\CSSD-Assignment\\server\\models\\location.model.js":["076bf10b-2570-48ae-ba89-4c94269b643b"],"E:\\UniWork\\CSSD\\CSSD-Assignment\\server\\models\\user.model.js":["076bf10b-2570-48ae-ba89-4c94269b643b"],"E:\\UniWork\\CSSD\\CSSD-Assignment\\server\\routes\\auth.routes.js":["076bf10b-2570-48ae-ba89-4c94269b643b"],"E:\\UniWork\\CSSD\\CSSD-Assignment\\server\\controllers\\auth.controller.js":["076bf10b-2570-48ae-ba89-4c94269b643b"],"E:\\UniWork\\CSSD\\CSSD-Assignment\\server\\business\\user.business.js":["076bf10b-2570-48ae-ba89-4c94269b643b"],"E:\\UniWork\\CSSD\\CSSD-Assignment\\server\\datalayer\\mongo.js":["076bf10b-2570-48ae-ba89-4c94269b643b"],"E:\\UniWork\\CSSD\\CSSD-Assignment\\server\\routes\\bill.routes.js":["076bf10b-2570-48ae-ba89-4c94269b643b"],"E:\\UniWork\\CSSD\\CSSD-Assignment\\server\\middleware\\auth\\authJwt.js":["076bf10b-2570-48ae-ba89-4c94269b643b"],"E:\\UniWork\\CSSD\\CSSD-Assignment\\server\\controllers\\bill.controller.js":["076bf10b-2570-48ae-ba89-4c94269b643b"],"E:\\UniWork\\CSSD\\CSSD-Assignment\\server\\business\\bill.business.js":["076bf10b-2570-48ae-ba89-4c94269b643b"],"E:\\UniWork\\CSSD\\CSSD-Assignment\\server\\routes\\user.routes.js":["076bf10b-2570-48ae-ba89-4c94269b643b"],"E:\\UniWork\\CSSD\\CSSD-Assignment\\server\\controllers\\user.controller.js":["076bf10b-2570-48ae-ba89-4c94269b643b"]},"externalIds":{}}
{"processes":{"efe9c07c-459b-49c2-9570-3741e715827b":{"parent":null,"children":[]}},"files":{"E:\\UniWork\\CSSD\\CSSD-Assignment\\server\\app.js":["efe9c07c-459b-49c2-9570-3741e715827b"],"E:\\UniWork\\CSSD\\CSSD-Assignment\\server\\database\\index.js":["efe9c07c-459b-49c2-9570-3741e715827b"],"E:\\UniWork\\CSSD\\CSSD-Assignment\\server\\config\\db.config.js":["efe9c07c-459b-49c2-9570-3741e715827b"],"E:\\UniWork\\CSSD\\CSSD-Assignment\\server\\models\\journey.model.js":["efe9c07c-459b-49c2-9570-3741e715827b"],"E:\\UniWork\\CSSD\\CSSD-Assignment\\server\\models\\bill.model.js":["efe9c07c-459b-49c2-9570-3741e715827b"],"E:\\UniWork\\CSSD\\CSSD-Assignment\\server\\utilities.js":["efe9c07c-459b-49c2-9570-3741e715827b"],"E:\\UniWork\\CSSD\\CSSD-Assignment\\server\\models\\location.model.js":["efe9c07c-459b-49c2-9570-3741e715827b"],"E:\\UniWork\\CSSD\\CSSD-Assignment\\server\\models\\user.model.js":["efe9c07c-459b-49c2-9570-3741e715827b"],"E:\\UniWork\\CSSD\\CSSD-Assignment\\server\\routes\\auth.routes.js":["efe9c07c-459b-49c2-9570-3741e715827b"],"E:\\UniWork\\CSSD\\CSSD-Assignment\\server\\controllers\\auth.controller.js":["efe9c07c-459b-49c2-9570-3741e715827b"],"E:\\UniWork\\CSSD\\CSSD-Assignment\\server\\business\\user.business.js":["efe9c07c-459b-49c2-9570-3741e715827b"],"E:\\UniWork\\CSSD\\CSSD-Assignment\\server\\datalayer\\mongo.js":["efe9c07c-459b-49c2-9570-3741e715827b"],"E:\\UniWork\\CSSD\\CSSD-Assignment\\server\\routes\\bill.routes.js":["efe9c07c-459b-49c2-9570-3741e715827b"],"E:\\UniWork\\CSSD\\CSSD-Assignment\\server\\middleware\\auth\\authJwt.js":["efe9c07c-459b-49c2-9570-3741e715827b"],"E:\\UniWork\\CSSD\\CSSD-Assignment\\server\\controllers\\bill.controller.js":["efe9c07c-459b-49c2-9570-3741e715827b"],"E:\\UniWork\\CSSD\\CSSD-Assignment\\server\\business\\bill.business.js":["efe9c07c-459b-49c2-9570-3741e715827b"],"E:\\UniWork\\CSSD\\CSSD-Assignment\\server\\routes\\user.routes.js":["efe9c07c-459b-49c2-9570-3741e715827b"],"E:\\UniWork\\CSSD\\CSSD-Assignment\\server\\controllers\\user.controller.js":["efe9c07c-459b-49c2-9570-3741e715827b"]},"externalIds":{}}
75 changes: 37 additions & 38 deletions server/coverage/lcov.info
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
TN:
SF:app.js
FN:32,(anonymous_0)
FN:38,(anonymous_0)
FNF:1
FNH:0
FNDA:0,(anonymous_0)
Expand All @@ -17,23 +17,23 @@ DA:11,1
DA:13,1
DA:15,1
DA:24,1
DA:29,1
DA:30,1
DA:31,1
DA:32,1
DA:33,1
DA:34,1
DA:35,1
DA:36,1
DA:38,1
DA:39,1
DA:40,1
DA:41,1
DA:42,1
DA:43,1
DA:44,1
DA:45,1
DA:46,1
DA:47,1
DA:48,1
DA:49,1
DA:50,1
DA:52,1
DA:51,1
DA:54,1
DA:55,1
DA:56,1
DA:58,1
LF:30
LH:30
BRF:0
Expand Down Expand Up @@ -119,7 +119,7 @@ FN:98,(anonymous_9)
FN:102,(anonymous_10)
FN:110,(anonymous_11)
FN:117,(anonymous_12)
FN:127,isUserDataValid
FN:126,isUserDataValid
FNF:14
FNH:12
FNDA:2,(anonymous_0)
Expand Down Expand Up @@ -167,9 +167,8 @@ DA:103,0
DA:111,1
DA:117,1
DA:118,0
DA:119,0
DA:128,4
LF:33
DA:127,4
LF:32
LH:29
BRDA:24,0,0,1
BRDA:24,0,1,4
Expand All @@ -179,10 +178,10 @@ BRDA:84,2,0,1
BRDA:84,2,1,1
BRDA:86,3,0,1
BRDA:86,3,1,0
BRDA:128,4,0,4
BRDA:128,4,1,4
BRDA:128,4,2,3
BRDA:128,4,3,3
BRDA:127,4,0,4
BRDA:127,4,1,4
BRDA:127,4,2,3
BRDA:127,4,3,3
BRF:12
BRH:11
end_of_record
Expand Down Expand Up @@ -348,15 +347,15 @@ SF:datalayer\mongo.js
FN:2,(anonymous_0)
FN:10,(anonymous_1)
FN:16,(anonymous_2)
FN:17,(anonymous_3)
FN:23,(anonymous_4)
FN:28,(anonymous_5)
FN:29,(anonymous_6)
FN:38,(anonymous_7)
FN:48,(anonymous_8)
FN:55,(anonymous_9)
FN:62,(anonymous_10)
FN:66,(anonymous_11)
FN:19,(anonymous_3)
FN:27,(anonymous_4)
FN:32,(anonymous_5)
FN:35,(anonymous_6)
FN:44,(anonymous_7)
FN:54,(anonymous_8)
FN:61,(anonymous_9)
FN:68,(anonymous_10)
FN:72,(anonymous_11)
FNF:12
FNH:12
FNDA:3,(anonymous_0)
Expand All @@ -374,16 +373,16 @@ FNDA:1,(anonymous_11)
DA:4,3
DA:11,5
DA:17,5
DA:18,5
DA:24,1
DA:29,1
DA:30,1
DA:39,1
DA:49,5
DA:56,3
DA:63,2
DA:67,1
DA:72,1
DA:20,5
DA:28,1
DA:33,1
DA:36,1
DA:45,1
DA:55,5
DA:62,3
DA:69,2
DA:73,1
DA:78,1
LF:13
LH:13
BRF:0
Expand Down
112 changes: 85 additions & 27 deletions server/database/seed.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,9 @@ mongoose.journeys = require("../models/journey.model")(mongoose);
mongoose.bills = require("../models/bill.model")(mongoose);
const bcrypt = require("bcryptjs");
const environment = process.env.NODE_ENV;
let dbConfig = require("../config/db.config.js")[environment] ?? { url: "mongodb://localhost:27017/highwaytrackerdb_testing" };
let dbConfig = require("../config/db.config.js")[environment] ?? {
url: "mongodb://localhost:27017/highwaytrackerdb_testing",
};

mongoose
.connect(dbConfig.url, {
Expand Down Expand Up @@ -40,7 +42,7 @@ const users = [
email: "operator@email.com",
password: bcrypt.hashSync("test1", 8),
type: "Toll Operator",
}
},
];

const locations = [
Expand All @@ -49,76 +51,132 @@ const locations = [
name: "test_location_1",
coordinates: {
longitude: 50,
latitude: 50
}
latitude: 50,
},
},
{
_id: "123456789102",
name: "test_location_2",
coordinates: {
longitude: 0,
latitude: 0
}
}
]
latitude: 0,
},
},
];

const journeys = [
{
_id: "123456789103",
regNumber: "test_reg_number",
entryLocation: "123456789101",
exitLocation: "123456789102",
journeyDateTime: "2022-02-01T15:50:51.039Z"
journeyDateTime: "2022-02-01T15:50:51.039Z",
},
{
_id: "123456789104",
regNumber: "test_reg_number2",
entryLocation: "123456789101",
exitLocation: "123456789102",
journeyDateTime: "2022-02-01T15:50:51.038Z"
journeyDateTime: "2022-02-01T15:50:51.038Z",
},
{
_id: "123456789109",
regNumber: "test_reg_number",
entryLocation: "123456789101",
exitLocation: "123456789102",
journeyDateTime: "2022-02-01T15:50:51.039Z"
}
]
journeyDateTime: "2022-02-01T15:50:51.039Z",
},
{
_id: "123456789130",
regNumber: "test_reg_number",
entryLocation: "123456789101",
exitLocation: "123456789102",
journeyDateTime: "2022-02-01T15:50:51.039Z",
},
{
_id: "123456789131",
regNumber: "test_reg_number3",
entryLocation: "123456789101",
exitLocation: "123456789102",
journeyDateTime: "2022-02-01T15:50:51.039Z",
},
{
_id: "123456789132",
regNumber: "test_reg_number",
entryLocation: "123456789101",
exitLocation: "123456789102",
journeyDateTime: "2022-02-01T15:50:51.039Z",
},
{
_id: "123456789133",
regNumber: "test_reg_number5",
entryLocation: "123456789101",
exitLocation: "123456789102",
journeyDateTime: "2022-02-01T15:50:51.039Z",
},
];

const bills = [
{
_id: "123456789105",
journey: "123456789103",
driver: "123456789107",
cost: 5,
paid: false
paid: false,
},
{
_id: "123456789106",
journey: "123456789104",
driver: "123456789108",
cost: 5,
paid: true
cost: 10,
paid: true,
},
{
_id: "123456789110",
journey: "123456789109",
driver: "123456789107",
cost: 5,
paid: false
}
]
cost: 500,
paid: false,
},
{
_id: "123456789120",
journey: "123456789130",
driver: "123456789107",
cost: 52,
paid: false,
},
{
_id: "123456789121",
journey: "123456789131",
driver: "123456789107",
cost: 46,
paid: false,
},
{
_id: "123456789122",
journey: "123456789132",
driver: "123456789107",
cost: 90,
paid: false,
},
{
_id: "123456789123",
journey: "123456789133",
driver: "123456789107",
cost: 534,
paid: false,
},
];

const seedDB = async () => {
for(const collection in mongoose.connection.collections){
await mongoose.connection.collections[collection].deleteMany()
for (const collection in mongoose.connection.collections) {
await mongoose.connection.collections[collection].deleteMany();
}
await mongoose.users.insertMany(users)
await mongoose.locations.insertMany(locations)
await mongoose.journeys.insertMany(journeys)
await mongoose.bills.insertMany(bills)

await mongoose.users.insertMany(users);
await mongoose.locations.insertMany(locations);
await mongoose.journeys.insertMany(journeys);
await mongoose.bills.insertMany(bills);
};

seedDB()
Expand Down
16 changes: 10 additions & 6 deletions server/datalayer/mongo.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,11 @@ class DataLayer {
.skip(filter.offset * filter.limit)
.populate(JSON.parse(JSON.stringify(populateFilter)))
.then((bills) => {
return this.model.countDocuments().then((count) => {
return { bills: bills, count: count };
});
return this.model
.countDocuments(JSON.parse(JSON.stringify(filter)))
.then((count) => {
return { bills: bills, count: count };
});
});
}
/**
Expand All @@ -28,9 +30,11 @@ class DataLayer {
.limit(filter.limit)
.skip(filter.offset * filter.limit)
.then((users) => {
return this.model.countDocuments().then((count) => {
return { users: users, count: count };
});
return this.model
.countDocuments(JSON.parse(JSON.stringify(filter)))
.then((count) => {
return { users: users, count: count };
});
});
}

Expand Down
Loading