Fixed malformed URL crashing the Java version of the server, tests fixed

Author: dfreniche

client/src/app/book.service.ts

@@ -16,7 +16,7 @@ export class BookService {
       limit = 100;
     }
 
-    return this.http.get<Book[]>(`${URL}/books?limit=${limit}?skip=${skip}`)
+    return this.http.get<Book[]>(`${URL}/books?limit=${limit}&skip=${skip}`)
       .pipe(
         map(books => books.map(book => new BookView(book)))
       )

server/src/routes/books.spec.ts

@@ -3,15 +3,17 @@ import assert from 'assert';
 import { users, books, getBaseUrl, cleanDatabase } from '../utils/testing-shared.js';
 import BookController from '../controllers/books.js';
 
-const adminJWT = users.admin.jwt;
-const userJWT = users.user1.jwt;
+let adminJWT;
+let userJWT;
 
 const bookController = new BookController();
 
 describe('Books API', () => {
     const book = books.sample;
 
     before(async () => {
+        adminJWT = users.admin.jwt;
+        userJWT = users.user1.jwt;
         await cleanDatabase();
     });
 

server/src/routes/borrows.spec.ts

@@ -5,8 +5,8 @@ import { getBaseUrl, users, books } from '../utils/testing-shared.js';
 import { cleanDatabase } from '../utils/testing-shared.js';
 import IssueDetailsController from '../controllers/issue-details.js';
 
-const adminJWT = users.admin.jwt;
-const userJWT = users.user1.jwt;
+let adminJWT;
+let userJWT;
 
 const issueDetailsController = new IssueDetailsController();
 
@@ -16,6 +16,9 @@ describe('Borrows API', () => {
     const bookWithOneCopy: Book = books.oneCopy;
 
     before(async () => {
+        adminJWT = users.admin.jwt;
+        userJWT = users.user1.jwt;
+
         await cleanDatabase();
 
         await request(getBaseUrl())

server/src/routes/reservations.spec.ts

@@ -4,9 +4,10 @@ import { getBaseUrl, users, books, cleanDatabase } from '../utils/testing-shared
 import IssueDetailsController from '../controllers/issue-details.js';
 import BookController from '../controllers/books.js';
 
-const adminJWT = users.admin.jwt;
-const userJWT = users.user1.jwt;
-const userId = users.user1._id;
+
+let adminJWT;
+let userJWT;
+let userId;
 
 const issueDetailsController = new IssueDetailsController();
 const bookController = new BookController();
@@ -15,6 +16,10 @@ describe('Reservation API', () => {
     const book = books.oneCopy;
 
     before(async () => {
+        adminJWT = users.admin.jwt;
+        userJWT = users.user1.jwt;
+        userId = users.user1._id;
+        
         await cleanDatabase();
         await request(getBaseUrl())
             .post('/books')

server/src/routes/reviews.spec.ts

@@ -3,8 +3,8 @@ import assert from 'assert';
 import { getBaseUrl, users, books, cleanDatabase } from '../utils/testing-shared.js';
 import ReviewsController from '../controllers/reviews.js';
 
-const adminJWT = users.admin.jwt;
-const userJWT = users.user1.jwt;
+let adminJWT: string;
+let userJWT: string;
 
 const reviewsController = new ReviewsController();
 
@@ -16,6 +16,9 @@ describe('Reviews API', () => {
     };
 
     before(async () => {
+        adminJWT = users.admin.jwt;
+        userJWT = users.user1.jwt;
+
         await cleanDatabase();
         await request(getBaseUrl())
             .post('/books')

server/src/utils/testing-shared.ts

@@ -1,9 +1,7 @@
 import { MongoClient, ObjectId } from 'mongodb';
 import { Book } from '../models/book';
 import { connectToDatabase, collections } from '../database.js';
-
-const adminJWT = 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiI2NGQ0Yzk2NGYwZDA1NmVhNmJmMGYzZDgiLCJuYW1lIjoiT2xkU2Nob29sIEFsbGlnYXRvciIsImlzQWRtaW4iOnRydWUsImlhdCI6MTY5MTY2Njc4OCwiZXhwIjoxNzIzMjAyNzg4fQ.0ycGXmrPBBJC9f1_nhJ7Ypi0C1DjzcZ6NpQVvpDAnJM';
-const userJWT = 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiI2NGQ0Yzc1MDViZDQ4MzEwNWM0ODk5MWQiLCJuYW1lIjoiUm93ZHkgSHllbmEiLCJpYXQiOjE2OTE2NjY3ODgsImV4cCI6MTcyMzIwMjc4OH0.YCFLMDhF4R009QT3bOy_H90ocgpKRhIMdbtpOvO-s-c';
+import request from 'supertest';
 
 export const getBaseUrl = () => `http://localhost:${process.env.PORT}`;
 
@@ -32,6 +30,14 @@ export async function initializeTestData() {
         users.admin,
         users.user1,
     ]);
+
+    const adminResponse = await request(getBaseUrl())
+        .get(`/users/login/${users.admin.name}`);
+    users.admin.jwt = adminResponse.body.jwt;
+
+    const userResponse = await request(getBaseUrl())
+        .get(`/users/login/${users.user1.name}`);
+    users.user1.jwt = userResponse.body.jwt;
 }
 
 export async function cleanTestData() {
@@ -47,11 +53,9 @@ export async function cleanTestData() {
 
 export async function cleanDatabase() {
     return await Promise.all([
-        collections?.books?.deleteOne({ _id: books.sample._id }),
-        collections?.books?.deleteOne({ _id: books.oneCopy._id }),
-        collections?.books?.deleteOne({ _id: books.notAvailable._id }),
-        collections.issueDetails?.deleteMany({ _id: new RegExp(`^${users.user1._id}`) }),
-        collections.reviews?.deleteMany({ name: users.user1.name })
+        collections?.books?.deleteMany(),
+        collections.issueDetails?.deleteMany(),
+        collections.reviews?.deleteMany()
     ]);
 }
 
@@ -60,12 +64,12 @@ export const users = {
         _id: new ObjectId('64d4c964f0d056ea6bf0f3d8'),
         name: 'OldSchool Alligator',
         isAdmin: true,
-        jwt: adminJWT,
+        jwt: ''
     },
     user1: {
         _id: new ObjectId('64d4c7505bd483105c48991d'),
         name: 'Rowdy Hyena',
-        jwt: userJWT,
+        jwt: ''
     }
 };