XPath scoping to resource for collections and members ref:

#209

Author: jateeter

src/main/java/org/energyos/espi/common/service/impl/ElectricPowerQualitySummaryServiceImpl.java

@@ -21,6 +21,7 @@
 import java.util.UUID;
 
 import org.energyos.espi.common.domain.ElectricPowerQualitySummary;
+import org.energyos.espi.common.domain.ElectricPowerUsageSummary;
 import org.energyos.espi.common.domain.UsagePoint;
 import org.energyos.espi.common.models.atom.EntryType;
 import org.energyos.espi.common.repositories.ElectricPowerQualitySummaryRepository;
@@ -96,7 +97,14 @@ public EntryType findEntryType(Long retailCustomerId, Long usagePointId,
 		try {
 			// TODO - this is sub-optimal (but defers the need to understand creation of an EntryType
 			List<Long> temp = new ArrayList<Long>();
-			temp.add(electricPowerQualitySummaryId);
+			temp = resourceService.findAllIdsByXPath(retailCustomerId, usagePointId, ElectricPowerUsageSummary.class);
+//			temp.add(electricPowerQualitySummaryId);
+			if (temp.contains(electricPowerQualitySummaryId)) { 
+				temp.clear();
+				temp.add(electricPowerQualitySummaryId);
+			} else {
+				temp.clear();
+			}
 			result = (new EntryTypeIterator(resourceService, temp, ElectricPowerQualitySummary.class)).nextEntry(ElectricPowerQualitySummary.class);
 		} catch (Exception e) {
 			// TODO need a log file entry as we are going to return a null if
@@ -112,7 +120,9 @@ public EntryTypeIterator findEntryTypeIterator(Long retailCustomerId, Long usage
 		try {
 			// TODO - this is sub-optimal (but defers the need to understand creation of an EntryType
 			List<Long> temp = new ArrayList<Long>();
-			temp = resourceService.findAllIds(ElectricPowerQualitySummary.class);
+	//		temp = resourceService.findAllIds(ElectricPowerQualitySummary.class);
+			temp = resourceService.findAllIdsByXPath(retailCustomerId, usagePointId, ElectricPowerQualitySummary.class);
+
 			result = (new EntryTypeIterator(resourceService, temp, ElectricPowerQualitySummary.class));
 		} catch (Exception e) {
 			// TODO need a log file entry as we are going to return a null if

src/main/java/org/energyos/espi/common/service/impl/ElectricPowerUsageSummaryServiceImpl.java

@@ -94,7 +94,7 @@ public EntryTypeIterator findEntryTypeIterator(Long retailCustomerId, Long usage
 		try {
 			// TODO - this is sub-optimal (but defers the need to understan creation of an EntryType
 			List<Long> temp = new ArrayList<Long>();
-			temp = resourceService.findAllIds(ElectricPowerUsageSummary.class);
+			temp = resourceService.findAllIdsByXPath(retailCustomerId, usagePointId, ElectricPowerUsageSummary.class);
 			result = (new EntryTypeIterator(resourceService, temp, ElectricPowerUsageSummary.class));
 		} catch (Exception e) {
 			// TODO need a log file entry as we are going to return a null if
@@ -111,7 +111,15 @@ public EntryType findEntryType(Long retailCustomerId, Long usagePointId,
 		try {
 			// TODO - this is sub-optimal (but defers the need to understan creation of an EntryType
 			List<Long> temp = new ArrayList<Long>();
-			temp.add(electricPowerUsageSummaryId);
+			temp = resourceService.findAllIdsByXPath(retailCustomerId, usagePointId, ElectricPowerUsageSummary.class);
+//			temp.add(electricPowerUsageSummaryId);
+			if (temp.contains(electricPowerUsageSummaryId)) { 
+				temp.clear();
+				temp.add(electricPowerUsageSummaryId);
+			} else {
+				temp.clear();
+			}
+		
 			result = (new EntryTypeIterator(resourceService, temp, ElectricPowerUsageSummary.class)).nextEntry(ElectricPowerUsageSummary.class);
 		} catch (Exception e) {
 			// TODO need a log file entry as we are going to return a null if