From 4e86cd2f8448cf3802ba434cc32e7989ac510a4f Mon Sep 17 00:00:00 2001
From: ashmrtn <ashmrtnz@alcion.ai>
Date: Thu, 29 Sep 2022 16:20:50 -0700
Subject: [PATCH] Fix bug fetching contact folders with filters (#986)

## Description

Stop fetching all folders for every new folder seen, erasing previous results. Regression test to come in a later patch as it requires some extra infrastructure

## Type of change

<!--- Please check the type of change your PR introduces: --->
- [ ] :sunflower: Feature
- [x] :bug: Bugfix
- [ ] :world_map: Documentation
- [ ] :robot: Test
- [ ] :computer: CI/Deployment
- [ ] :hamster: Trivial/Minor

## Issue(s)

* closes #982

## Test Plan

<!-- How will this be tested prior to merging.-->
- [ ] :muscle: Manual
- [x] :zap: Unit test
- [ ] :green_heart: E2E
---
 src/internal/connector/exchange/service_iterators.go | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/internal/connector/exchange/service_iterators.go b/src/internal/connector/exchange/service_iterators.go
index 87d4e7c8c..5a69db0ed 100644
--- a/src/internal/connector/exchange/service_iterators.go
+++ b/src/internal/connector/exchange/service_iterators.go
@@ -449,6 +449,8 @@ func IterateSelectAllContactsForCollections(
 				return true
 			}
 
+			isPrimarySet = true
+
 			// Create and Populate Default Contacts folder Collection if true
 			if qp.Scope.Matches(selectors.ExchangeContactFolder, DefaultContactFolder) {
 				dirPath, err := path.Builder{}.Append(DefaultContactFolder).ToDataLayerExchangePathForCategory(
@@ -486,7 +488,6 @@ func IterateSelectAllContactsForCollections(
 
 				edc.jobs = append(edc.jobs, listOfIDs...)
 				collections[DefaultContactFolder] = &edc
-				isPrimarySet = true
 			}
 		}