From 8c0b6655656cfa6f093065bce9849059eed69463 Mon Sep 17 00:00:00 2001
From: jamesagnew <jamesagnew@gmail.com>
Date: Sat, 10 Oct 2015 10:06:41 -0400
Subject: [PATCH] Fix subscription issue

---
 .../ca/uhn/fhir/jpa/dao/BaseHapiFhirDao.java  |  2 +-
 .../dao/FhirResourceDaoSubscriptionDstu2.java |  9 ++++--
 .../FhirResourceDaoDstu2SubscriptionTest.java | 29 ++++++++++---------
 hapi-fhir-jpaserver-example/.gitignore        |  1 +
 4 files changed, 23 insertions(+), 18 deletions(-)

diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/BaseHapiFhirDao.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/BaseHapiFhirDao.java
index 0fa5f897246..30ea8766463 100644
--- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/BaseHapiFhirDao.java
+++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/BaseHapiFhirDao.java
@@ -1233,7 +1233,7 @@ public abstract class BaseHapiFhirDao<T extends IBaseResource> implements IDao {
 		boolean paramsUriPopulated = theEntity.isParamsUriPopulated();
 		boolean hasLinks = theEntity.isHasLinks();
 
-		Collection<ResourceIndexedSearchParamString> paramsString = new ArrayList<ResourceIndexedSearchParamString>(theEntity.getParamsString());
+		Collection<ResourceIndexedSearchParamString> paramsString = new ArrayList<ResourceIndexedSearchParamString>(theEntity.getParamsString()); // TODO: use the isPopulated method to decide whether to call this
 		Collection<ResourceIndexedSearchParamToken> paramsToken = new ArrayList<ResourceIndexedSearchParamToken>(theEntity.getParamsToken());
 		Collection<ResourceIndexedSearchParamNumber> paramsNumber = new ArrayList<ResourceIndexedSearchParamNumber>(theEntity.getParamsNumber());
 		Collection<ResourceIndexedSearchParamQuantity> paramsQuantity = new ArrayList<ResourceIndexedSearchParamQuantity>(theEntity.getParamsQuantity());
diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/FhirResourceDaoSubscriptionDstu2.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/FhirResourceDaoSubscriptionDstu2.java
index 7f6719cd3c7..b47d93cb204 100644
--- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/FhirResourceDaoSubscriptionDstu2.java
+++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/FhirResourceDaoSubscriptionDstu2.java
@@ -116,6 +116,7 @@ public class FhirResourceDaoSubscriptionDstu2 extends FhirResourceDaoDstu2<Subsc
 			retVal += txTemplate.execute(new TransactionCallback<Integer>() {
 				@Override
 				public Integer doInTransaction(TransactionStatus theStatus) {
+					SubscriptionTable nextSubscriptionTable = mySubscriptionTableDao.findOne(nextSubscriptionTablePid);
 					return pollForNewUndeliveredResources(nextSubscriptionTable);
 				}
 			});
@@ -156,7 +157,7 @@ public class FhirResourceDaoSubscriptionDstu2 extends FhirResourceDaoDstu2<Subsc
 		Date mostRecentMatch = null;
 		for (IBaseResource next : results.getResources(0, results.size())) {
 
-			Date updated = ResourceMetadataKeyEnum.PUBLISHED.get((IResource) next).getValue();
+			Date updated = ResourceMetadataKeyEnum.UPDATED.get((IResource) next).getValue();
 			if (mostRecentMatch == null) {
 				mostRecentMatch = updated;
 			} else {
@@ -169,7 +170,9 @@ public class FhirResourceDaoSubscriptionDstu2 extends FhirResourceDaoDstu2<Subsc
 
 			SubscriptionFlaggedResource nextFlag = new SubscriptionFlaggedResource();
 			Long pid = IDao.RESOURCE_PID.get((IResource) next);
-
+			
+			ourLog.info("New resource for subscription: {}", pid);
+			
 			nextFlag.setResource(myEntityManager.find(ResourceTable.class, pid));
 			nextFlag.setSubscription(theSubscriptionTable);
 			nextFlag.setVersion(next.getIdElement().getVersionIdPartAsLong());
@@ -181,7 +184,7 @@ public class FhirResourceDaoSubscriptionDstu2 extends FhirResourceDaoDstu2<Subsc
 		ourLog.debug("Updating most recent match for subcription {} to {}", subscription.getId().getIdPart(), new InstantDt(mostRecentMatch));
 		
 		theSubscriptionTable.setMostRecentMatch(mostRecentMatch);
-		myEntityManager.merge(theSubscriptionTable);
+		mySubscriptionTableDao.save(theSubscriptionTable);
 		
 		return results.size();
 	}
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/FhirResourceDaoDstu2SubscriptionTest.java b/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/FhirResourceDaoDstu2SubscriptionTest.java
index 5fd2750fe67..f313ea4b988 100644
--- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/FhirResourceDaoDstu2SubscriptionTest.java
+++ b/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/FhirResourceDaoDstu2SubscriptionTest.java
@@ -387,7 +387,7 @@ public class FhirResourceDaoDstu2SubscriptionTest extends BaseJpaDstu2Test {
 		Observation obs = new Observation();
 		obs.getSubject().setReference(pId);
 		obs.setStatus(ObservationStatusEnum.FINAL);
-		myObservationDao.create(obs).getId().toUnqualifiedVersionless();
+		IIdType oId = myObservationDao.create(obs).getId().toUnqualifiedVersionless();
 
 		Subscription subs;
 
@@ -404,9 +404,13 @@ public class FhirResourceDaoDstu2SubscriptionTest extends BaseJpaDstu2Test {
 		assertNull(mySubscriptionTableDao.findOne(subsId1).getLastClientPoll());
 
 		assertEquals(0, mySubscriptionDao.pollForNewUndeliveredResources());
-		mySystemDao.markAllResourcesForReindexing();
-		mySystemDao.performReindexingPass(100);
+		
+		ourLog.info("pId: {}   - oId: {}", pId, oId);
+		
+		myObservationDao.update(myObservationDao.read(oId));
+		
 		assertEquals(1, mySubscriptionDao.pollForNewUndeliveredResources());
+		ourLog.info("Between passes");
 		assertEquals(0, mySubscriptionDao.pollForNewUndeliveredResources());
 
 		Thread.sleep(100);
@@ -415,32 +419,29 @@ public class FhirResourceDaoDstu2SubscriptionTest extends BaseJpaDstu2Test {
 		obs = new Observation();
 		obs.getSubject().setReference(pId);
 		obs.setStatus(ObservationStatusEnum.FINAL);
-		IIdType afterId1 = myObservationDao.create(obs).getId().toUnqualifiedVersionless();
+		myObservationDao.create(obs).getId().toUnqualifiedVersionless();
 
 		obs = new Observation();
 		obs.getSubject().setReference(pId);
 		obs.setStatus(ObservationStatusEnum.FINAL);
-		IIdType afterId2 = myObservationDao.create(obs).getId().toUnqualifiedVersionless();
+		myObservationDao.create(obs).getId().toUnqualifiedVersionless();
 
 		Thread.sleep(100);
 
 		ourLog.info("After: {}", System.currentTimeMillis());
 
-		List<IBaseResource> results;
-		List<IIdType> resultIds;
-
-		mySubscriptionDao.pollForNewUndeliveredResources();
-		assertEquals(2, mySubscriptionFlaggedResourceDataDao.count());
+		assertEquals(2, mySubscriptionDao.pollForNewUndeliveredResources());
+		assertEquals(3, mySubscriptionFlaggedResourceDataDao.count());
 
 		Thread.sleep(100);
 		
 		mySubscriptionDao.pollForNewUndeliveredResources();
-		assertEquals(2, mySubscriptionFlaggedResourceDataDao.count());
+		assertEquals(3, mySubscriptionFlaggedResourceDataDao.count());
 		
 		Thread.sleep(100);
 		
 		mySubscriptionDao.pollForNewUndeliveredResources();
-		assertEquals(2, mySubscriptionFlaggedResourceDataDao.count());
+		assertEquals(3, mySubscriptionFlaggedResourceDataDao.count());
 
 		Thread.sleep(100);
 		
@@ -450,12 +451,12 @@ public class FhirResourceDaoDstu2SubscriptionTest extends BaseJpaDstu2Test {
 		myObservationDao.create(obs).getId().toUnqualifiedVersionless();
 
 		mySubscriptionDao.pollForNewUndeliveredResources();
-		assertEquals(3, mySubscriptionFlaggedResourceDataDao.count());
+		assertEquals(4, mySubscriptionFlaggedResourceDataDao.count());
 		
 		Thread.sleep(100);
 		
 		mySubscriptionDao.pollForNewUndeliveredResources();
-		assertEquals(3, mySubscriptionFlaggedResourceDataDao.count());
+		assertEquals(4, mySubscriptionFlaggedResourceDataDao.count());
 	}
 
 
diff --git a/hapi-fhir-jpaserver-example/.gitignore b/hapi-fhir-jpaserver-example/.gitignore
index 271ee2518a7..f59bdf9b9af 100644
--- a/hapi-fhir-jpaserver-example/.gitignore
+++ b/hapi-fhir-jpaserver-example/.gitignore
@@ -1,6 +1,7 @@
 /target
 /jpaserver_derby_files
 *.log
+ca.uhn.fhir.jpa.entity.ResourceTable/
 
 # Created by https://www.gitignore.io