Merge branch '20-improve-sentiment-analysis-service' into 'master'

Issue #20 fixed

Closes #20

See merge request aic18/G6T4!26

diff --git a/service-reporting/Controllers/PdfController.cs b/service-reporting/Controllers/PdfController.cs
index 4b679c6351849dfcb0cc524afd3675b039d84b74..726b8978f5bcd4a695e7f3c98448c51fac6630d7 100644 (file)
--- a/service-reporting/Controllers/PdfController.cs
+++ b/service-reporting/Controllers/PdfController.cs
@@ -2,6 +2,7 @@
 using DinkToPdf.Contracts;
 using Microsoft.AspNetCore.Mvc;
 using System.IO;
+using System;
 using PdfService.Utility;
 using PdfService.Models;
 namespace PdfService.Controllers
@@ -92,9 +93,12 @@ namespace PdfService.Controllers
                 GlobalSettings = globalSettings,
                 Objects = { objectSettings }
             };
- 
+            
             var file = _converter.Convert(pdf);
-            return File(file, "application/pdf");
+            if(Request.Headers["Accept"] == "application/base64")
+                return Content(Convert.ToBase64String(file));
+            else
+                return File(file, "application/pdf");
         }
 
     }

diff --git a/service-reporting/README.md b/service-reporting/README.md
index 08ec2e92ab09cd2fb775a372316b802fc8dc1afb..49640ff5533c2410012dd38bf6f42f4d2a7463fc 100644 (file)
--- a/service-reporting/README.md
+++ b/service-reporting/README.md
@@ -7,8 +7,9 @@ Provides a REST-API to generate PDF reports for terms and their sentiment analys
 - return: pdf file
 
 `POST`: `/generatePDF/` Generates a pdf report for the given terms
-- param: Term[] as Content-Type: `application/json`  
-e.g. body of request
+- Header: `Content-Type`: `application/json`  
+(optional) `Accept`: `application/base64` if the pdf should be in base64 instead of `application/pdf`  
+- Body of request: Term[] e.g.
 ```json
 [
   {
@@ -27,7 +28,7 @@ e.g. body of request
 ``` 
 - return: pdf file
 
-### Tweet model
+### Term model
 Term(string `Name`, double `Sentiment`)
 
 ## run with docker