Improve test case coverage

src/controllers/private/v1/ecosystems.private.controller.ts

@@ -647,14 +647,12 @@ export const getEcosystemContract = async (
   try {
     const { id } = req.params;
     const ecosystem = await Ecosystem.findById(id);
-
     if (!ecosystem)
       return res.status(404).json({
         code: 404,
         errorMsg: "Not found",
         message: "Ecosystem not found",
       });
-
     try {
       const contract = await getContractById(ecosystem.contract, "ecosystem");
       return res.json(contract);

src/controllers/private/v1/negotiation.private.controller.ts

@@ -118,37 +118,31 @@ export const authorizeExchangeConfiguration = async (
   try {
     const { id } = req.params;
     const { policy } = req.body;
-
     const exchangeConf = await ExchangeConfiguration.findById(id);
-
     if (!exchangeConf) {
       return res.status(404).json({
         code: 404,
         errorMsg: "Resource not found",
         message: "Exchange Configuration could not be found",
       });
     }
-
     if (exchangeConf.provider.toString() !== req.user.id.toString()) {
       return res.status(400).json({
         code: 400,
         errorMsg: "Resource error",
         message: "Exchange Configuration could not be authorized",
       });
     }
-
     if (exchangeConf.negotiationStatus === "Authorized") {
       return res.status(400).json({
         code: 400,
         errorMsg: "Invalid operation",
         message: "Exchange configuration has already been authorized",
       });
     }
-
     if (getDocumentId(exchangeConf.provider) !== req.user.id) {
       return res.status(401).json({ error: "Unauthorized operation" });
     }
-
     try {
       const contract = await generateBilateralContract({
         dataConsumer: exchangeConf.consumer,
@@ -163,13 +157,11 @@ export const authorizeExchangeConfiguration = async (
     } catch (err) {
       return res
         .status(409)
-        .json({ error: "Failed to generate contract: " + err.message });
+        .json({ errorMsg: "Failed to generate contract.", error: err.message });
     }
-
     exchangeConf.providerPolicies = policy;
     exchangeConf.negotiationStatus = "Authorized";
     exchangeConf.latestNegotiator = req.user.id;
-
     await exchangeConf.save();
     return res.status(200).json(exchangeConf);
   } catch (err) {
@@ -222,17 +214,14 @@ export const acceptNegotiation = async (
 ) => {
   try {
     const { id } = req.params;
-
     const exchangeConf = await ExchangeConfiguration.findById(id);
-
     if (!exchangeConf) {
       return res.status(404).json({
         code: 404,
         errorMsg: "Resource not found",
         message: "Exchange Configuration could not be found",
       });
     }
-
     if (exchangeConf.negotiationStatus === "SignatureReady") {
       return res.status(400).json({
         code: 400,
@@ -243,9 +232,7 @@ export const acceptNegotiation = async (
     }
 
     exchangeConf.negotiationStatus = "SignatureReady";
-
     await exchangeConf.save();
-
     return res.json(exchangeConf);
   } catch (err) {
     next(err);
@@ -264,7 +251,6 @@ export const signExchangeConfiguration = async (
   try {
     const { id } = req.params;
     const { signature } = req.body;
-
     const exchangeConf = await ExchangeConfiguration.findById(id).populate<{
       provider: IParticipant;
       consumer: IParticipant;
@@ -290,30 +276,26 @@ export const signExchangeConfiguration = async (
         populate: serviceOfferingPopulation,
       },
     ]);
-
     if (!exchangeConf) {
       return res.status(404).json({
         code: 404,
         errorMsg: "Resource not found",
         message: "Exchange Configuration could not be found",
       });
     }
-
     if (exchangeConf.negotiationStatus !== "SignatureReady") {
       return res.status(400).json({
         code: 400,
         errorMsg: "Invalid operation",
         message: "Exchange configuration is not ready for signature",
       });
     }
-
     const signingParty =
       req.user.id === getDocumentId(exchangeConf.provider)
         ? "provider"
         : "consumer";
 
     exchangeConf.signatures[signingParty] = signature;
-
     try {
       // If both have applied signatures, we can inject the policies
       // this avoid injecting the same policies multiple times
@@ -351,7 +333,6 @@ export const signExchangeConfiguration = async (
     }
 
     await exchangeConf.save();
-
     // The client can handle UI to show depending on the contract status
     return res.json({
       code: 200,

src/controllers/private/v1/serviceOfferings.private.controller.ts

@@ -80,8 +80,6 @@ export const updateServiceOffering = async (
 
     if (!updatedServiceOffering) {
       return res.status(404).json({
-        req,
-        res,
         code: 404,
         errorMsg: "Resource not found",
         message: "The service offering could not be found",
@@ -105,8 +103,6 @@ export const deleteServiceOffering = async (
     );
     if (!serviceOffering) {
       return res.status(404).json({
-        req,
-        res,
         code: 404,
         errorMsg: "Resource not found",
         message: "The service offering could not be found",

src/controllers/public/v1/dataResources.public.controller.ts

@@ -81,9 +81,7 @@ export const getDataResourceById = async (
   try {
     const dataResource = await DataResource.findById(req.params.id).populate([{ path: "representation", model: Representation }]).lean();
     if (!dataResource) {
-      return res.json({
-        req,
-        res,
+      return res.status(404).json({
         code: 404,
         errorMsg: "Resource not found",
         message: "The data resource could not be found",
@@ -110,9 +108,7 @@ export const getDCATDataResourceById = async (
   try {
     const dataResource = await DataResource.findById(req.params.id).lean();
     if (!dataResource) {
-      return res.json({
-        req,
-        res,
+      return res.status(404).json({
         code: 404,
         errorMsg: "Resource not found",
         message: "The data resource could not be found",

tests/dataResources.spec.ts

@@ -20,7 +20,7 @@ let providerId = "";
 let dataResourcesId: "";
 let jwt = "";
 
-describe("Data Resources Routes Tests", () => {
+describe("Data Resources Routes Tests", function () {
   let loadMongooseStub;
   before(async () => {
     loadMongooseStub = stub(loadMongoose, "loadMongoose").callsFake(
@@ -69,7 +69,6 @@ describe("Data Resources Routes Tests", () => {
       .send(dataResourceData)
       .expect(201);
     dataResourcesId = response.body._id;
-
     expect(response.body).to.be.an("object");
     //assertions
   });
@@ -89,7 +88,6 @@ describe("Data Resources Routes Tests", () => {
     const response = await request(app)
       .get(`/v1/dataResources/${dataResourcesId}`)
       .expect(200);
-    //assertions
     //expect response id = dataresourceid
   });
 
@@ -98,7 +96,6 @@ describe("Data Resources Routes Tests", () => {
       .get(`/v1/dataResources/${dataResourcesId}`)
       .set("Authorization", `Bearer ${jwt}`)
       .expect(200);
-    //assertions
     //expect response id = dataresourceid
   });
 
@@ -107,8 +104,8 @@ describe("Data Resources Routes Tests", () => {
       .get("/v1/dataResources/me")
       .set("Authorization", `Bearer ${jwt}`)
       .expect(200);
+    expect(response.body).to.not.be.empty;
     //assertions
-    //expect response not empty
   });
 
   it("Should get DCAT Data Resources", async () => {
@@ -123,17 +120,13 @@ describe("Data Resources Routes Tests", () => {
 
   it("should get all dataResources", async () => {
     const response = await request(app).get("/v1/dataResources").expect(200);
-    //assertions
-    //expect response not empty
+    expect(response.body).to.not.be.empty;
   });
 
   it("should delete DataResource by id", async () => {
     const response = await request(app)
       .delete(`/v1/dataResources/${dataResourcesId}`)
       .set("Authorization", `Bearer ${jwt}`)
       .expect(204);
-    //assertions
-    //expect
-    //error test get data resources deleted
   });
 });