coding complete on Bulk features

Author: jateeter

src/main/java/org/energyos/espi/common/domain/Authorization.java

@@ -137,7 +137,10 @@
         @NamedQuery(name = Authorization.QUERY_FIND_BY_REFRESH_TOKEN,
                 query = "SELECT authorization from Authorization authorization WHERE authorization.refreshToken = :refreshToken"),
         @NamedQuery(name = Authorization.QUERY_FIND_BY_RESOURCE_URI, 
-                query = "SELECT authorization FROM Authorization authorization WHERE authorization.resourceURI = :uri")
+                query = "SELECT authorization FROM Authorization authorization WHERE authorization.resourceURI = :uri"),
+        @NamedQuery(name = Authorization.QUERY_FIND_ALL_IDS_BY_BULK_ID, 
+                query = "SELECT authorization.id FROM Authorization authorization WHERE authorization.thirdParty = :thirdParty AND authorization.scope LIKE :bulkId")
+                 
 })
 public class Authorization
         extends IdentifiedObject {
@@ -151,6 +154,7 @@ public class Authorization
 	public final static String QUERY_FIND_BY_ACCESS_TOKEN = "Authorization.findByAccessToken";
 	public final static String QUERY_FIND_BY_REFRESH_TOKEN = "Authorization.findByRefreshToken";
 	public static final String QUERY_FIND_BY_RESOURCE_URI = "Authorization.findByResourceUri";
+	public static final String QUERY_FIND_ALL_IDS_BY_BULK_ID = "Authorization.findAllIdsByBulkId";
 
     @Embedded
     @AttributeOverrides({

src/main/java/org/energyos/espi/common/domain/Subscription.java

@@ -75,7 +75,7 @@
         @NamedQuery(name = Subscription.QUERY_FIND_BY_HASHED_ID, query = "SELECT subscription FROM Subscription subscription WHERE subscription.hashedId = :hashedId"),
         @NamedQuery(name = Subscription.QUERY_FIND_ALL_IDS, query = "SELECT subscription.id FROM Subscription subscription"),
         @NamedQuery(name = Subscription.QUERY_FIND_BY_AUTHORIZATION_ID, query = "SELECT subscription from Subscription subscription WHERE subscription.authorization.id = :id")
-})
+        })
 
 public class Subscription
         extends IdentifiedObject {

src/main/java/org/energyos/espi/common/repositories/AuthorizationRepository.java

@@ -48,5 +48,7 @@ public interface AuthorizationRepository {
     Authorization findByAccessToken(String accessToken);
 
 	Authorization findByRefreshToken(String refreshToken);
+	
+	public List<Long> findAllIdsByBulkId(String thirdParty, Long bulkId);
 
 }

src/main/java/org/energyos/espi/common/repositories/jpa/AuthorizationRepositoryImpl.java

@@ -109,4 +109,13 @@ public Authorization findByRefreshToken(String refreshToken) {
 				.setParameter("refreshToken", refreshToken)
 				.getSingleResult();
 	}
+
+	@SuppressWarnings("unchecked")
+	@Override
+	public List<Long> findAllIdsByBulkId(String thirdParty, Long bulkId) {
+		return em.createNamedQuery(Authorization.QUERY_FIND_ALL_IDS_BY_BULK_ID)
+				.setParameter("thirdParty", thirdParty)
+				.setParameter("bulkId", "%BR=" + bulkId + "%")
+				.getResultList();
+	}
 }

src/main/java/org/energyos/espi/common/repositories/jpa/SubscriptionRepositoryImpl.java

@@ -10,7 +10,6 @@
 import org.energyos.espi.common.domain.Subscription;
 import org.energyos.espi.common.domain.UsagePoint;
 import org.energyos.espi.common.repositories.SubscriptionRepository;
-
 import org.springframework.stereotype.Repository;
 import org.springframework.transaction.annotation.Transactional;
 

src/main/java/org/energyos/espi/common/service/AuthorizationService.java

@@ -59,6 +59,8 @@ public Authorization createAuthorization(Subscription subscription,
 	Authorization findByUUID(UUID uuid);
 
 	public Authorization findByRefreshToken(String refreshToken);
+	
+	public List<Long> findAllIdsByBulkId(String thirdParty, Long bulkId);
 
 
 }

src/main/java/org/energyos/espi/common/service/ExportService.java

@@ -146,8 +146,8 @@ void exportUsagePointsFull(Long subscriptionId, Long retailCustomerId, ServletOu
 	void exportUsagePointFull(Long subscriptionId, Long usagePointId, Long RetailCustomerId,
 			ServletOutputStream outputStream, ExportFilter exportFilter)  throws IOException;
 
-	public void exportBatchBulk(long bulkId, OutputStream outputStream, ExportFilter exportFilter) throws IOException;
+	public void exportBatchBulk(Long bulkId, String thirdParty,  OutputStream outputStream, ExportFilter exportFilter) throws IOException;
 
-	public void exportBatchSubscription(long subscriptionId, OutputStream outputStream, ExportFilter exportFilter) throws IOException;
+	public void exportBatchSubscription(Long subscriptionId, OutputStream outputStream, ExportFilter exportFilter) throws IOException;
 
 }

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

@@ -224,6 +224,11 @@ public Authorization findByRefreshToken(String refreshToken) {
 		return authorizationRepository.findByRefreshToken(refreshToken);
 	}
 
+	@Override
+	public List<Long> findAllIdsByBulkId(String thirdParty, Long bulkId) {
+		return authorizationRepository.findAllIdsByBulkId(thirdParty, bulkId);
+	}
+	
     public void setAuthorizationRepository(AuthorizationRepository authorizationRepository) {
         this.authorizationRepository = authorizationRepository;
    }

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

@@ -651,7 +651,7 @@ public void exportSubscription(String subscriptionHashedId,
 	}
 
 	@Override
-	public void exportBatchSubscription(long subscriptionId,
+	public void exportBatchSubscription(Long subscriptionId,
 			OutputStream stream, ExportFilter exportFilter) throws IOException {
 		String hrefFragment = "/Batch/Subscription/" + subscriptionId;
 		// first find all the usagePointIds this subscription is related to
@@ -663,11 +663,15 @@ public void exportBatchSubscription(long subscriptionId,
 	}
 
 	@Override
-	public void exportBatchBulk(long bulkId, OutputStream outputStream,
+	public void exportBatchBulk(Long bulkId, String thirdParty, OutputStream outputStream,
 			ExportFilter exportFilter) throws IOException {
 		// TODO Work with bulkService rather than subscriptionService
 		String hrefFragment = "/Batch/Bulk/" + bulkId;
-		List<Long> subscriptions = subscriptionService.findByBulkId(bulkId);
+		List<Long> subscriptions = new ArrayList<Long> ();
+		List<Long> authorizations = authorizationService.findAllIdsByBulkId(thirdParty, bulkId);
+		for (Long authorizationId : authorizations) {
+			subscriptions.add((subscriptionService.findByAuthorizationId(authorizationId)).getId());
+		}
 		exportEntriesFull(subscriptionService.findEntryTypeIterator(subscriptions),
 				outputStream, exportFilter, hrefFragment);
 	}

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

@@ -282,4 +282,6 @@ public ImportService getImportService () {
         return this.importService;
    }
 
+
+
 }