remove testing code and add new files

LuisValentim1 · Jan 4, 2021 · 536f363 · 536f363
1 parent fba0a60
commit 536f363
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 78 deletions.
diff --git a/blossom/src/main/java/com/ies/blossom/Testing.java b/blossom/src/main/java/com/ies/blossom/Testing.java
diff --git a/blossom/src/main/java/com/ies/blossom/controllers/ParcelController.java b/blossom/src/main/java/com/ies/blossom/controllers/ParcelController.java
@@ -1,6 +1,5 @@
 package com.ies.blossom.controllers;
 
-import com.ies.blossom.Testing;
 import com.ies.blossom.entitys.HumMeasure;
 import com.ies.blossom.entitys.HumSensor;
 import com.ies.blossom.entitys.Parcel;

diff --git a/blossom/src/main/java/com/ies/blossom/entitys/Parcel.java b/blossom/src/main/java/com/ies/blossom/entitys/Parcel.java
@@ -214,7 +214,8 @@ private Boolean plantIsGoodForParcel(Plant plant, boolean usesPh, boolean usesHu
     //
 
     private GoodPlantMeasureModel checkPlantMeasureConditions(boolean isHumidity, Plant plant, Set<Sensor> sensores) {
-    	if(this.noMeasure(isHumidity, null)) {
+    	sensores = this.getSensores(isHumidity, sensores);
+    	if(this.noMeasure(isHumidity, sensores)) {
     		return null;
     	} 
     	Double percentage = this.generalMeasurePercentage(isHumidity, plant, sensores);

diff --git a/blossom/src/main/java/com/ies/blossom/model/GoodPlantMeasureModel.java b/blossom/src/main/java/com/ies/blossom/model/GoodPlantMeasureModel.java
@@ -0,0 +1,22 @@
+package com.ies.blossom.model;
+
+public class GoodPlantMeasureModel {
+
+
+	private double percentage;
+	private boolean good;
+
+	public GoodPlantMeasureModel(double percentage, boolean good){
+		this.percentage = percentage;
+		this.good = good;
+	}
+
+	public double getPercentage() {
+		return percentage;
+	}
+
+	public boolean isGood() {
+		return good;
+	}
+
+}