bug: Fix artifact loading to include branchview

Change-Id: I72b430952db2fd62495c2b123cb47d45d05b84c3
Signed-off-by: Morgan E. Cook <Morgan.e.cook@boeing.com>

12 files changed, 31 insertions, 17 deletions

diff --git a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/change/MissingChangeItemFactoryImpl.java b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/change/MissingChangeItemFactoryImpl.java
index 834187e51fa..d962c9ecfee 100644
--- a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/change/MissingChangeItemFactoryImpl.java
+++ b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/change/MissingChangeItemFactoryImpl.java
@@ -122,6 +122,7 @@ public class MissingChangeItemFactoryImpl implements MissingChangeItemFactory {
       final Set<Integer> missingArtIds = new LinkedHashSet<>(artIds);
       loader.includeDeletedArtifacts();
       loader.fromTransaction(destTx);
+      loader.fromBranchView(destTx.getBranch().getViewId());
 
       loader.load(cancellation, new LoadDataHandlerAdapter() {
 
@@ -141,6 +142,7 @@ public class MissingChangeItemFactoryImpl implements MissingChangeItemFactory {
       loader.withLoadLevel(LoadLevel.ALL);
       loader.includeDeletedArtifacts();
       loader.fromTransaction(sourceTx);
+      loader.fromBranchView(sourceTx.getBranch().getViewId());
 
       loader.load(cancellation, new LoadDataHandlerAdapter() {
 
@@ -197,6 +199,7 @@ public class MissingChangeItemFactoryImpl implements MissingChangeItemFactory {
       DataLoader loader =
          dataLoaderFactory.newDataLoaderFromIds(session, destTx.getBranch(), relationChangesToAdd.keySet());
       loader.fromTransaction(destTx);
+      loader.fromBranchView(destTx.getBranch().getViewId());
       loader.load(cancellation, new LoadDataHandlerAdapter() {
 
          @Override
diff --git a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/loader/DataLoaderImpl.java b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/loader/DataLoaderImpl.java
index 0953caf4a60..6d8eb26c6ca 100644
--- a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/loader/DataLoaderImpl.java
+++ b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/loader/DataLoaderImpl.java
@@ -15,6 +15,7 @@ import java.util.Collection;
 import java.util.HashSet;
 import java.util.Set;
 import org.eclipse.osee.executor.admin.HasCancellation;
+import org.eclipse.osee.framework.core.data.ArtifactId;
 import org.eclipse.osee.framework.core.data.AttributeTypeId;
 import org.eclipse.osee.framework.core.data.BranchId;
 import org.eclipse.osee.framework.core.data.AttributeTypeId;
@@ -157,6 +158,12 @@ public class DataLoaderImpl implements DataLoader {
    }
 
    @Override
+   public DataLoader fromBranchView(ArtifactId viewId) {
+      OptionsUtil.setFromBranchView(getOptions(), viewId);
+      return this;
+   }
+
+   @Override
    public DataLoader fromHeadTransaction() {
       OptionsUtil.setHeadTransaction(getOptions());
       return this;
diff --git a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/loader/LoadSqlWriter.java b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/loader/LoadSqlWriter.java
index 37859ebb5d3..ffed781cd1d 100644
--- a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/loader/LoadSqlWriter.java
+++ b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/loader/LoadSqlWriter.java
@@ -47,7 +47,7 @@ public class LoadSqlWriter extends AbstractSqlWriter {
       if (OptionsUtil.isHistorical(getOptions())) {
          write(", %s.transaction_id as stripe_transaction_id", txAlias);
       }
-      write(",\n %s.id2", artJoinAlias);
+      write(",\n %s.id2, %s.id4", artJoinAlias, artJoinAlias);
       for (SqlHandler<?> handler : handlers) {
          setHandlerLevel(handler);
          write(", ");
diff --git a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/loader/data/BranchDataImpl.java b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/loader/data/BranchDataImpl.java
index 7911967ee48..e0a1503a12d 100644
--- a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/loader/data/BranchDataImpl.java
+++ b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/loader/data/BranchDataImpl.java
@@ -34,12 +34,12 @@ public class BranchDataImpl extends NamedIdBase implements BranchData, BranchRea
    private boolean inheritAccessControl = false;
    private ArtifactId viewId = ArtifactId.SENTINEL;
 
-   public BranchDataImpl(Long branchId, String name) {
-      this(branchId, name, ArtifactId.SENTINEL);
+   public BranchDataImpl(BranchId branch, String name) {
+      this(branch, name, ArtifactId.SENTINEL);
    }
 
-   public BranchDataImpl(Long branchId, String name, ArtifactId viewId) {
-      super(branchId, name);
+   public BranchDataImpl(BranchId branch, String name, ArtifactId viewId) {
+      super(branch.getId(), name);
       this.viewId = viewId;
    }
 
diff --git a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/loader/data/BranchObjectFactory.java b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/loader/data/BranchObjectFactory.java
index 716ee54b34d..a8efa82bc5e 100644
--- a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/loader/data/BranchObjectFactory.java
+++ b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/loader/data/BranchObjectFactory.java
@@ -24,7 +24,7 @@ import org.eclipse.osee.orcs.core.ds.BranchData;
  */
 public interface BranchObjectFactory extends OrcsDataFactory {
 
-   BranchData createBranchData(Long branchUuid, BranchType branchType, String name, BranchId parentBranch, TransactionId baseTransaction, TransactionId sourceTransaction, BranchArchivedState archiveState, BranchState branchState, ArtifactId associatedArtifact, boolean inheritAccessControl) throws OseeCoreException;
+   BranchData createBranchData(BranchId branch, BranchType branchType, String name, BranchId parentBranch, TransactionId baseTransaction, TransactionId sourceTransaction, BranchArchivedState archiveState, BranchState branchState, ArtifactId associatedArtifact, boolean inheritAccessControl) throws OseeCoreException;
 
    BranchData createCopy(BranchData source) throws OseeCoreException;
 }
diff --git a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/loader/data/OrcsObjectFactoryImpl.java b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/loader/data/OrcsObjectFactoryImpl.java
index 681ae7dcc94..7b192b6f469 100644
--- a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/loader/data/OrcsObjectFactoryImpl.java
+++ b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/loader/data/OrcsObjectFactoryImpl.java
@@ -196,8 +196,8 @@ public class OrcsObjectFactoryImpl implements OrcsObjectFactory {
    }
 
    @Override
-   public BranchData createBranchData(Long branchUuid, BranchType branchType, String name, BranchId parentBranch, TransactionId baseTransaction, TransactionId sourceTransaction, BranchArchivedState archiveState, BranchState branchState, ArtifactId associatedArtifact, boolean inheritAccessControl) {
-      BranchData data = new BranchDataImpl(branchUuid, name);
+   public BranchData createBranchData(BranchId branch, BranchType branchType, String name, BranchId parentBranch, TransactionId baseTransaction, TransactionId sourceTransaction, BranchArchivedState archiveState, BranchState branchState, ArtifactId associatedArtifact, boolean inheritAccessControl) {
+      BranchData data = new BranchDataImpl(branch, name);
       data.setArchiveState(archiveState);
       data.setAssociatedArtifact(associatedArtifact);
       data.setBaseTransaction(baseTransaction);
@@ -211,7 +211,7 @@ public class OrcsObjectFactoryImpl implements OrcsObjectFactory {
 
    @Override
    public BranchData createCopy(BranchData source) {
-      return createBranchData(source.getId(), source.getBranchType(), source.getName(), source.getParentBranch(),
+      return createBranchData(BranchId.create(source.getId(), source.getViewId()), source.getBranchType(), source.getName(), source.getParentBranch(),
          source.getBaseTransaction(), source.getSourceTransaction(), source.getArchiveState(), source.getBranchState(),
          source.getAssociatedArtifact(), source.isInheritAccessControl());
    }
diff --git a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/loader/executors/ArtifactQueryContextLoadExecutor.java b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/loader/executors/ArtifactQueryContextLoadExecutor.java
index d19ad712928..5dfe8e3670a 100644
--- a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/loader/executors/ArtifactQueryContextLoadExecutor.java
+++ b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/loader/executors/ArtifactQueryContextLoadExecutor.java
@@ -53,6 +53,7 @@ public class ArtifactQueryContextLoadExecutor extends AbstractLoadExecutor {
 
       Id4JoinQuery join = createId4Join(getJdbcClient(), cancellation, fetchSize);
 
+      OptionsUtil.setFromBranchView(options, queryContext.getBranch().getViewId());
       LoadSqlContext loadContext = new LoadSqlContext(queryContext.getSession(), options, queryContext.getBranch());
       getLoader().loadArtifacts(cancellation, handler, join, criteria, loadContext, fetchSize);
    }
@@ -73,11 +74,12 @@ public class ArtifactQueryContextLoadExecutor extends AbstractLoadExecutor {
             checkCancelled(cancellation);
          }
          TransactionId transactionId = OptionsUtil.getFromTransaction(queryContext.getOptions());
+         ArtifactId viewId = OptionsUtil.getFromBranchView(queryContext.getOptions());
          Consumer<JdbcStatement> consumer = stmt -> {
             checkCancelled(cancellation);
             Integer artId = stmt.getInt("art_id");
             BranchId branchUuid = BranchId.valueOf(stmt.getLong("branch_id"));
-            artifactJoin.add(branchUuid, ArtifactId.valueOf(artId), transactionId);
+            artifactJoin.add(branchUuid, ArtifactId.valueOf(artId), transactionId, viewId);
             checkCancelled(cancellation);
          };
          checkCancelled(cancellation);
diff --git a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/loader/processor/ArtifactLoadProcessor.java b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/loader/processor/ArtifactLoadProcessor.java
index 506692ea94c..e8cb9dbf358 100644
--- a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/loader/processor/ArtifactLoadProcessor.java
+++ b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/loader/processor/ArtifactLoadProcessor.java
@@ -36,7 +36,7 @@ public class ArtifactLoadProcessor extends LoadProcessor<ArtifactData, ArtifactO
       ArtifactData toReturn = null;
 
       int artifactId = chStmt.getInt("id2");
-      BranchId branch = BranchId.valueOf(chStmt.getLong("branch_id"));
+      BranchId branch = BranchId.create(chStmt.getLong("branch_id"), OptionsUtil.getFromBranchView(options));
 
       CreateConditions onCreate = asConditions(conditions);
       if (!onCreate.isSame(branch, artifactId)) {
diff --git a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/loader/processor/AttributeLoadProcessor.java b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/loader/processor/AttributeLoadProcessor.java
index 1c73daf2065..20f7b524eab 100644
--- a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/loader/processor/AttributeLoadProcessor.java
+++ b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/loader/processor/AttributeLoadProcessor.java
@@ -44,7 +44,7 @@ public class AttributeLoadProcessor extends LoadProcessor<AttributeData, Attribu
    protected AttributeData createData(Object conditions, AttributeObjectFactory factory, JdbcStatement chStmt, Options options) throws OseeCoreException {
       AttributeData toReturn = null;
 
-      BranchId branch = BranchId.valueOf(chStmt.getLong("branch_id"));
+      BranchId branch = BranchId.create(chStmt.getLong("branch_id"), OptionsUtil.getFromBranchView(options));
       int artId = chStmt.getInt("id2");
       int attrId = chStmt.getInt("attr_id");
       long gammaId = chStmt.getInt("gamma_id");
diff --git a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/loader/processor/BranchLoadProcessor.java b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/loader/processor/BranchLoadProcessor.java
index a742f56efdc..342c7288cba 100644
--- a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/loader/processor/BranchLoadProcessor.java
+++ b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/loader/processor/BranchLoadProcessor.java
@@ -20,6 +20,7 @@ import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
 import org.eclipse.osee.jdbc.JdbcStatement;
 import org.eclipse.osee.orcs.core.ds.BranchData;
 import org.eclipse.osee.orcs.core.ds.Options;
+import org.eclipse.osee.orcs.core.ds.OptionsUtil;
 import org.eclipse.osee.orcs.db.internal.loader.data.BranchObjectFactory;
 
 /**
@@ -33,7 +34,7 @@ public class BranchLoadProcessor extends LoadProcessor<BranchData, BranchObjectF
 
    @Override
    protected BranchData createData(Object conditions, BranchObjectFactory factory, JdbcStatement chStmt, Options options) throws OseeCoreException {
-      long branchUuid = chStmt.getLong("branch_id");
+      BranchId branch = BranchId.create(chStmt.getLong("branch_id"), OptionsUtil.getFromBranchView(options));
 
       String branchName = chStmt.getString("branch_name");
       BranchState branchState = BranchState.getBranchState(chStmt.getInt("branch_state"));
@@ -46,7 +47,7 @@ public class BranchLoadProcessor extends LoadProcessor<BranchData, BranchObjectF
       ArtifactId assocArtId = ArtifactId.valueOf(chStmt.getLong("associated_art_id"));
       boolean inheritAccessControl = chStmt.getInt("inherit_access_control") != 0;
 
-      return factory.createBranchData(branchUuid, branchType, branchName, parentBranchId, baseTx, sourceTx,
-         archiveState, branchState, assocArtId, inheritAccessControl);
+      return factory.createBranchData(branch, branchType, branchName, parentBranchId, baseTx, sourceTx, archiveState,
+         branchState, assocArtId, inheritAccessControl);
    }
 }
diff --git a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/loader/processor/RelationLoadProcessor.java b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/loader/processor/RelationLoadProcessor.java
index 56b640ca716..1ca0f1cf23f 100644
--- a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/loader/processor/RelationLoadProcessor.java
+++ b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/loader/processor/RelationLoadProcessor.java
@@ -39,7 +39,7 @@ public class RelationLoadProcessor extends LoadProcessor<RelationData, RelationO
    protected RelationData createData(Object conditions, RelationObjectFactory factory, JdbcStatement chStmt, Options options) throws OseeCoreException {
       RelationData toReturn = null;
 
-      BranchId branch = BranchId.valueOf(chStmt.getLong("branch_id"));
+      BranchId branch = BranchId.create(chStmt.getLong("branch_id"), OptionsUtil.getFromBranchView(options));
       int aArtId = chStmt.getInt("a_art_id");
       int bArtId = chStmt.getInt("b_art_id");
       long typeId = chStmt.getLong("rel_link_type_id");
diff --git a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/loader/processor/TransactionLoadProcessor.java b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/loader/processor/TransactionLoadProcessor.java
index 8a32e8d09c1..ce141613f12 100644
--- a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/loader/processor/TransactionLoadProcessor.java
+++ b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/loader/processor/TransactionLoadProcessor.java
@@ -17,6 +17,7 @@ import org.eclipse.osee.framework.core.enums.TransactionDetailsType;
 import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
 import org.eclipse.osee.jdbc.JdbcStatement;
 import org.eclipse.osee.orcs.core.ds.Options;
+import org.eclipse.osee.orcs.core.ds.OptionsUtil;
 import org.eclipse.osee.orcs.core.ds.TxOrcsData;
 import org.eclipse.osee.orcs.db.internal.loader.data.TransactionObjectFactory;
 
@@ -31,7 +32,7 @@ public class TransactionLoadProcessor extends LoadProcessor<TxOrcsData, Transact
 
    @Override
    protected TxOrcsData createData(Object conditions, TransactionObjectFactory factory, JdbcStatement chStmt, Options options) throws OseeCoreException {
-      BranchId branch = BranchId.valueOf(chStmt.getLong("branch_id"));
+      BranchId branch = BranchId.create(chStmt.getLong("branch_id"), OptionsUtil.getFromBranchView(options));
       Long localId = chStmt.getLong("transaction_id");
       TransactionDetailsType type = TransactionDetailsType.toEnum(chStmt.getInt("tx_type"));
       String comment = chStmt.getString("osee_comment");