Merge branch 'realease-1.0.1'

ggraffieti · ggraffieti · commit 00bfa7de0a72 · 2018-06-07T15:24:11.000+02:00
diff --git a/.gitignore b/.gitignore
@@ -33,3 +33,6 @@ it.unibo.iss.libs/*
 
 node_modules
 build
+
+.vscode
+slides/*
diff --git a/App/.gitignore b/App/.gitignore
@@ -35,6 +35,3 @@ proguard/
 
 # Android Studio captures folder
 captures/
-
-
-**/ServerParameters.java
diff --git a/App/app/build.gradle b/App/app/build.gradle
@@ -6,8 +6,8 @@ android {
         applicationId "org.gammf.proxima"
         minSdkVersion 18
         targetSdkVersion 26
-        versionCode 1
-        versionName "1.0"
+        versionCode 2
+        versionName "1.0.1"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
     buildTypes {
diff --git a/App/app/src/main/java/org/gammf/proxima/util/ServerParameters.java b/App/app/src/main/java/org/gammf/proxima/util/ServerParameters.java
@@ -0,0 +1,13 @@
+package org.gammf.proxima.util;
+
+/**
+ * Class meant to contain the server parameter, such as its communication protocol, its IP address and its port.
+ */
+public final class ServerParameters {
+
+    public static final String PROTOCOL = "https";
+    public static final String SERVER_IP = "192.168.43.57";
+    public static final Integer SERVER_PORT = 6041;
+
+    private ServerParameters() {}
+}
diff --git a/DnsService/gradle.properties b/DnsService/gradle.properties
@@ -2,7 +2,7 @@ jdkVersion = 1.8
 
 group = org.gammf.proxima
 artifactId = dnsservice
-version = 1.0
+version = 1.0.1
 longName = Proxima DNS Service
 projectDescription = A Domain Name System for the Proxima project.
 
@@ -18,4 +18,4 @@ playFrameworkVersion = 2.6.9
 httpClientVersion = 4.5.4
 
 jUnitVersion = 4.12
-scalaTestVersion = 3.0.1
+scalaTestVersion = 3.0.1
diff --git a/FirstAidService/package.json b/FirstAidService/package.json
@@ -1,6 +1,6 @@
 {
   "name": "first_aid_service",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "The server that manages the access to medical data. It manages the authorization system (base on digital signature) and the physical access to medical databases.",
   "main": "build/main.js",
   "scripts": {
diff --git a/FirstAidService/src/main/handlers/dataRequestHandler.ts b/FirstAidService/src/main/handlers/dataRequestHandler.ts
@@ -35,7 +35,7 @@ export class DataRequestHandler extends RequestHandler {
     let targetID: string = req.query.targetID;
     let signature: string = req.query.signature;
 
-    this.consoleLogger.logInConsole("New medical data request");
+    DataRequestHandler.consoleLogger.logInConsole("New medical data request");
 
     if (operatorID && targetID && signature) {
 
@@ -57,32 +57,32 @@ export class DataRequestHandler extends RequestHandler {
       .then((data) => {
         res.send(data);
         DataRequestHandler.logger.logDataAccess(operatorID, targetID);
-        this.consoleLogger.logInConsole("Rescuer " + operatorID + " autorized to read medical data of patient " + targetID);
+        DataRequestHandler.consoleLogger.logInConsole("Rescuer " + operatorID + " autorized to read medical data of patient " + targetID);
       })
       .catch(error => {
         if (error instanceof DatabaseError) {
           DataRequestHandler.sendServerError(res);
-          this.consoleLogger.logInConsole("An internal error occurred");
+          DataRequestHandler.consoleLogger.logInConsole("An internal error occurred");
         } 
         else if ((error instanceof WrongDigitalSignatureError) || (error instanceof RescuerShiftError)) {
           DataRequestHandler.sendUnauthorizedError(res);
           if (error instanceof WrongDigitalSignatureError) {
-            this.consoleLogger.logInConsole("Wrong digital signature, rescuer " + operatorID);
+            DataRequestHandler.consoleLogger.logInConsole("Wrong digital signature, rescuer " + operatorID);
           } 
           else {
-            this.consoleLogger.logInConsole("Rescuer " + operatorID + " tried to access data outside work hours");
+            DataRequestHandler.consoleLogger.logInConsole("Rescuer " + operatorID + " tried to access data outside work hours");
           }
         }
         else {
           DataRequestHandler.sendServerError(res);
-          this.consoleLogger.logInConsole("An internal error occurred");
+          DataRequestHandler.consoleLogger.logInConsole("An internal error occurred");
         }
         DataRequestHandler.logger.logDataAccessDenied(operatorID, targetID);
       });
     }
     else {
       DataRequestHandler.sendBadRequestError(res);
-      this.consoleLogger.logInConsole("Bad Request...dropped");
+      DataRequestHandler.consoleLogger.logInConsole("Bad Request...dropped");
     }
   }
 
diff --git a/FrontServer/package.json b/FrontServer/package.json
@@ -1,6 +1,6 @@
 {
   "name": "frontserver",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "HTTP front server of the Proxima system",
   "main": "index.js",
   "scripts": {
diff --git a/Logger/package.json b/Logger/package.json
@@ -1,6 +1,6 @@
 {
   "name": "proxima-first-aid-logger",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "",
   "main": "build/main.js",
   "scripts": {
diff --git a/ProximaProblemAnalysisModel/src/baseModel.qa b/ProximaProblemAnalysisModel/src/baseModel.qa
@@ -16,7 +16,6 @@ QActor qpatient context ctxBaseDebug {
 	Rules {
 		identifier(patient1).
 	}
-	
 	Plan init normal
 	[
 		println("[qpatient] started!")
diff --git a/ProximaProblemAnalysisModel/src/it/unibo/qatheory/qDataControlTheory.pl b/ProximaProblemAnalysisModel/src/it/unibo/qatheory/qDataControlTheory.pl
@@ -1,4 +1,4 @@
 authorized(SENDER, RESCUER_ID, PATIENT_ID) :- request(SENDER, RESCUER_ID, PATIENT_ID), rescuer(RESCUER_ID).
 		
-response(SENDER, PATIENT_ID, NAME, SURNAME, BLOOD_GROUP) :- senderRequestData(SENDER, PATIENT_ID),
+response(SENDER, PATIENT_ID, NAME, SURNAME, BLOOD_GROUP) :- senderRequestData(SENDER, RESCUER_ID, PATIENT_ID),
 	data(PATIENT_ID, NAME, SURNAME, BLOOD_GROUP).
diff --git a/ProximaProblemAnalysisModel/src/it/unibo/qdns/Qdns.java b/ProximaProblemAnalysisModel/src/it/unibo/qdns/Qdns.java
@@ -0,0 +1,16 @@
+/* Generated by AN DISI Unibo */ 
+/*
+This code is generated only ONCE
+*/
+package it.unibo.qdns;
+import it.unibo.is.interfaces.IOutputEnvView;
+import it.unibo.qactors.QActorContext;
+
+public class Qdns extends AbstractQdns { 
+	public Qdns(String actorId, QActorContext myCtx, IOutputEnvView outEnvView )  throws Exception{
+		super(actorId, myCtx, outEnvView);
+	}
+/*
+ * ADDED BY THE APPLICATION DESIGNER	
+ */
+}
diff --git a/ProximaProblemAnalysisModel/src/it/unibo/qfirstaid/Qfirstaid.java b/ProximaProblemAnalysisModel/src/it/unibo/qfirstaid/Qfirstaid.java
@@ -0,0 +1,16 @@
+/* Generated by AN DISI Unibo */ 
+/*
+This code is generated only ONCE
+*/
+package it.unibo.qfirstaid;
+import it.unibo.is.interfaces.IOutputEnvView;
+import it.unibo.qactors.QActorContext;
+
+public class Qfirstaid extends AbstractQfirstaid { 
+	public Qfirstaid(String actorId, QActorContext myCtx, IOutputEnvView outEnvView )  throws Exception{
+		super(actorId, myCtx, outEnvView);
+	}
+/*
+ * ADDED BY THE APPLICATION DESIGNER	
+ */
+}
diff --git a/ProximaProblemAnalysisModel/src/it/unibo/qlogger/Qlogger.java b/ProximaProblemAnalysisModel/src/it/unibo/qlogger/Qlogger.java
@@ -0,0 +1,16 @@
+/* Generated by AN DISI Unibo */ 
+/*
+This code is generated only ONCE
+*/
+package it.unibo.qlogger;
+import it.unibo.is.interfaces.IOutputEnvView;
+import it.unibo.qactors.QActorContext;
+
+public class Qlogger extends AbstractQlogger { 
+	public Qlogger(String actorId, QActorContext myCtx, IOutputEnvView outEnvView )  throws Exception{
+		super(actorId, myCtx, outEnvView);
+	}
+/*
+ * ADDED BY THE APPLICATION DESIGNER	
+ */
+}
diff --git a/ProximaProblemAnalysisModel/src/it/unibo/qorchestrator/Qorchestrator.java b/ProximaProblemAnalysisModel/src/it/unibo/qorchestrator/Qorchestrator.java
@@ -0,0 +1,16 @@
+/* Generated by AN DISI Unibo */ 
+/*
+This code is generated only ONCE
+*/
+package it.unibo.qorchestrator;
+import it.unibo.is.interfaces.IOutputEnvView;
+import it.unibo.qactors.QActorContext;
+
+public class Qorchestrator extends AbstractQorchestrator { 
+	public Qorchestrator(String actorId, QActorContext myCtx, IOutputEnvView outEnvView )  throws Exception{
+		super(actorId, myCtx, outEnvView);
+	}
+/*
+ * ADDED BY THE APPLICATION DESIGNER	
+ */
+}
diff --git a/ProximaProblemAnalysisModel/src/it/unibo/qusersauth/Qusersauth.java b/ProximaProblemAnalysisModel/src/it/unibo/qusersauth/Qusersauth.java
@@ -0,0 +1,16 @@
+/* Generated by AN DISI Unibo */ 
+/*
+This code is generated only ONCE
+*/
+package it.unibo.qusersauth;
+import it.unibo.is.interfaces.IOutputEnvView;
+import it.unibo.qactors.QActorContext;
+
+public class Qusersauth extends AbstractQusersauth { 
+	public Qusersauth(String actorId, QActorContext myCtx, IOutputEnvView outEnvView )  throws Exception{
+		super(actorId, myCtx, outEnvView);
+	}
+/*
+ * ADDED BY THE APPLICATION DESIGNER	
+ */
+}
diff --git a/ProximaProblemAnalysisModel/src/logicArchitectureModel.qa b/ProximaProblemAnalysisModel/src/logicArchitectureModel.qa
diff --git a/UsersAuthorizationsService/package.json b/UsersAuthorizationsService/package.json
diff --git a/report/img/entities.png b/report/img/entities.png
diff --git a/report/img/interaction.png b/report/img/interaction.png
diff --git a/report/img/meta_model.png b/report/img/meta_model.png
diff --git a/report/proxima.tex b/report/proxima.tex

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "first_aid_service",`
`3`		`- "version": "1.0.0",`
	`3`	`+ "version": "1.0.1",`
`4`	`4`	`"description": "The server that manages the access to medical data. It manages the authorization system (base on digital signature) and the physical access to medical databases.",`
`5`	`5`	`"main": "build/main.js",`
`6`	`6`	`"scripts": {`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ export class DataRequestHandler extends RequestHandler {`
`35`	`35`	`let targetID: string = req.query.targetID;`
`36`	`36`	`let signature: string = req.query.signature;`
`37`	`37`
`38`		`- this.consoleLogger.logInConsole("New medical data request");`
	`38`	`+ DataRequestHandler.consoleLogger.logInConsole("New medical data request");`
`39`	`39`
`40`	`40`	`if (operatorID && targetID && signature) {`
`41`	`41`
`@@ -57,32 +57,32 @@ export class DataRequestHandler extends RequestHandler {`
`57`	`57`	`.then((data) => {`
`58`	`58`	`res.send(data);`
`59`	`59`	`DataRequestHandler.logger.logDataAccess(operatorID, targetID);`
`60`		`- this.consoleLogger.logInConsole("Rescuer " + operatorID + " autorized to read medical data of patient " + targetID);`
	`60`	`+ DataRequestHandler.consoleLogger.logInConsole("Rescuer " + operatorID + " autorized to read medical data of patient " + targetID);`
`61`	`61`	`})`
`62`	`62`	`.catch(error => {`
`63`	`63`	`if (error instanceof DatabaseError) {`
`64`	`64`	`DataRequestHandler.sendServerError(res);`
`65`		`- this.consoleLogger.logInConsole("An internal error occurred");`
	`65`	`+ DataRequestHandler.consoleLogger.logInConsole("An internal error occurred");`
`66`	`66`	`}`
`67`	`67`	`else if ((error instanceof WrongDigitalSignatureError) \|\| (error instanceof RescuerShiftError)) {`
`68`	`68`	`DataRequestHandler.sendUnauthorizedError(res);`
`69`	`69`	`if (error instanceof WrongDigitalSignatureError) {`
`70`		`- this.consoleLogger.logInConsole("Wrong digital signature, rescuer " + operatorID);`
	`70`	`+ DataRequestHandler.consoleLogger.logInConsole("Wrong digital signature, rescuer " + operatorID);`
`71`	`71`	`}`
`72`	`72`	`else {`
`73`		`- this.consoleLogger.logInConsole("Rescuer " + operatorID + " tried to access data outside work hours");`
	`73`	`+ DataRequestHandler.consoleLogger.logInConsole("Rescuer " + operatorID + " tried to access data outside work hours");`
`74`	`74`	`}`
`75`	`75`	`}`
`76`	`76`	`else {`
`77`	`77`	`DataRequestHandler.sendServerError(res);`
`78`		`- this.consoleLogger.logInConsole("An internal error occurred");`
	`78`	`+ DataRequestHandler.consoleLogger.logInConsole("An internal error occurred");`
`79`	`79`	`}`
`80`	`80`	`DataRequestHandler.logger.logDataAccessDenied(operatorID, targetID);`
`81`	`81`	`});`
`82`	`82`	`}`
`83`	`83`	`else {`
`84`	`84`	`DataRequestHandler.sendBadRequestError(res);`
`85`		`- this.consoleLogger.logInConsole("Bad Request...dropped");`
	`85`	`+ DataRequestHandler.consoleLogger.logInConsole("Bad Request...dropped");`
`86`	`86`	`}`
`87`	`87`	`}`
`88`	`88`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "frontserver",`
`3`		`- "version": "1.0.0",`
	`3`	`+ "version": "1.0.1",`
`4`	`4`	`"description": "HTTP front server of the Proxima system",`
`5`	`5`	`"main": "index.js",`
`6`	`6`	`"scripts": {`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "proxima-first-aid-logger",`
`3`		`- "version": "1.0.0",`
	`3`	`+ "version": "1.0.1",`
`4`	`4`	`"description": "",`
`5`	`5`	`"main": "build/main.js",`
`6`	`6`	`"scripts": {`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,6 @@ QActor qpatient context ctxBaseDebug {`
`16`	`16`	`Rules {`
`17`	`17`	`identifier(patient1).`
`18`	`18`	`}`
`19`		`-`
`20`	`19`	`Plan init normal`
`21`	`20`	`[`
`22`	`21`	`println("[qpatient] started!")`