From ecbb7e27b6212a25d3579b7768ae2a390ad053ce Mon Sep 17 00:00:00 2001
From: jenncarneiro <jennifer@passionfruitpartners.com>
Date: Thu, 31 Jul 2025 11:31:16 -0400
Subject: [PATCH 1/5] Product2.Category__c picklist field added

---
 ...uct Layout for Memberships.layout-meta.xml |  4 ++
 .../fields/Category__c.field-meta.xml         | 46 +++++++++++++++++++
 2 files changed, 50 insertions(+)
 create mode 100644 force-app/main/default/objects/Product2/fields/Category__c.field-meta.xml

diff --git a/force-app/main/default/layouts/Product2-Product Layout for Memberships.layout-meta.xml b/force-app/main/default/layouts/Product2-Product Layout for Memberships.layout-meta.xml
index 0a593fd..7e2adcd 100644
--- a/force-app/main/default/layouts/Product2-Product Layout for Memberships.layout-meta.xml	
+++ b/force-app/main/default/layouts/Product2-Product Layout for Memberships.layout-meta.xml	
@@ -32,6 +32,10 @@
                 <behavior>Edit</behavior>
                 <field>Downgrade_Path__c</field>
             </layoutItems>
+            <layoutItems>
+                <behavior>Edit</behavior>
+                <field>Category__c</field>
+            </layoutItems>
         </layoutColumns>
         <layoutColumns>
             <layoutItems>
diff --git a/force-app/main/default/objects/Product2/fields/Category__c.field-meta.xml b/force-app/main/default/objects/Product2/fields/Category__c.field-meta.xml
new file mode 100644
index 0000000..76c770e
--- /dev/null
+++ b/force-app/main/default/objects/Product2/fields/Category__c.field-meta.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+    <fullName>Category__c</fullName>
+    <externalId>false</externalId>
+    <inlineHelpText>Category represents the type of product provided</inlineHelpText>
+    <label>Category</label>
+    <required>false</required>
+    <trackHistory>false</trackHistory>
+    <type>Picklist</type>
+    <valueSet>
+        <restricted>true</restricted>
+        <valueSetDefinition>
+            <sorted>false</sorted>
+            <value>
+                <fullName>Access</fullName>
+                <default>false</default>
+                <label>Access</label>
+            </value>
+            <value>
+                <fullName>Services</fullName>
+                <default>false</default>
+                <label>Services</label>
+            </value>
+            <value>
+                <fullName>Resources</fullName>
+                <default>false</default>
+                <label>Resources</label>
+            </value>
+            <value>
+                <fullName>Goods</fullName>
+                <default>false</default>
+                <label>Goods</label>
+            </value>
+            <value>
+                <fullName>Engagement</fullName>
+                <default>false</default>
+                <label>Engagement</label>
+            </value>
+            <value>
+                <fullName>Special</fullName>
+                <default>false</default>
+                <label>Special</label>
+            </value>
+        </valueSetDefinition>
+    </valueSet>
+</CustomField>

From ab921a2854f39d6429afead1dc739e812c914f16 Mon Sep 17 00:00:00 2001
From: jenncarneiro <jennifer@passionfruitpartners.com>
Date: Thu, 31 Jul 2025 12:32:05 -0400
Subject: [PATCH 2/5] Updated the Membership Finder to locate a matching
 membership across a set of matching products (Same category); Updated to
 stamp that Finder Ran if a match is Not found.

---
 ...V_Listener_Membership_Finder.flow-meta.xml | 103 +++++++++++++++---
 1 file changed, 87 insertions(+), 16 deletions(-)

diff --git a/force-app/main/default/flows/DPEV_Listener_Membership_Finder.flow-meta.xml b/force-app/main/default/flows/DPEV_Listener_Membership_Finder.flow-meta.xml
index 9f73a07..01435e1 100644
--- a/force-app/main/default/flows/DPEV_Listener_Membership_Finder.flow-meta.xml
+++ b/force-app/main/default/flows/DPEV_Listener_Membership_Finder.flow-meta.xml
@@ -6,7 +6,7 @@
         <name>AssignMembershiptoOpportunityProduct</name>
         <label>AssignMembershiptoOpportunityProduct</label>
         <locationX>50</locationX>
-        <locationY>710</locationY>
+        <locationY>926</locationY>
         <assignmentItems>
             <assignToReference>OpportunityProductforUpdate.Membership__c</assignToReference>
             <operator>Assign</operator>
@@ -40,7 +40,7 @@
         <name>SetMembershipFinderRanFlag</name>
         <label>SetMembershipFinderRanFlag</label>
         <locationX>314</locationX>
-        <locationY>710</locationY>
+        <locationY>1226</locationY>
         <assignmentItems>
             <assignToReference>OpportunityProductforUpdate.Membership_Finder_Ran__c</assignToReference>
             <operator>Assign</operator>
@@ -49,7 +49,7 @@
             </value>
         </assignmentItems>
         <connector>
-            <targetReference>Create_Membership_Essentials_Log_Pass1</targetReference>
+            <targetReference>UpdateOpportunityLineItem</targetReference>
         </connector>
     </assignments>
     <decisions>
@@ -57,7 +57,7 @@
         <name>MembershipPresent</name>
         <label>MembershipPresent</label>
         <locationX>314</locationX>
-        <locationY>602</locationY>
+        <locationY>818</locationY>
         <defaultConnectorLabel>Default Outcome</defaultConnectorLabel>
         <rules>
             <name>Membership_Found</name>
@@ -85,7 +85,7 @@
                 </rightValue>
             </conditions>
             <connector>
-                <targetReference>SetMembershipFinderRanFlag</targetReference>
+                <targetReference>Create_Membership_Essentials_Log_Pass1</targetReference>
             </connector>
             <label>Membership not found</label>
         </rules>
@@ -123,9 +123,9 @@
         <name>Copy_2_of_Create_Membership_Essentials_Log_Pass</name>
         <label>Copy 2 of Create Membership Essentials Log - Pass</label>
         <locationX>50</locationX>
-        <locationY>818</locationY>
+        <locationY>1034</locationY>
         <connector>
-            <targetReference>UpdateOpportunityLineItem</targetReference>
+            <targetReference>SetMembershipFinderRanFlag</targetReference>
         </connector>
         <inputAssignments>
             <field>Flow_Name__c</field>
@@ -152,7 +152,7 @@
         <name>Create_GetMembership_Membership_Essentials_Log</name>
         <label>Create &quot;GetMembership&quot; Membership Essentials Log</label>
         <locationX>1106</locationX>
-        <locationY>602</locationY>
+        <locationY>818</locationY>
         <inputAssignments>
             <field>Flow_Name__c</field>
             <value>
@@ -230,7 +230,7 @@
         <name>Create_Membership_Essentials_Log_Pass</name>
         <label>Create Membership Essentials Log - Pass</label>
         <locationX>314</locationX>
-        <locationY>1118</locationY>
+        <locationY>1442</locationY>
         <inputAssignments>
             <field>Flow_Name__c</field>
             <value>
@@ -256,9 +256,9 @@
         <name>Create_Membership_Essentials_Log_Pass1</name>
         <label>Create Membership Essentials Log - Pass</label>
         <locationX>314</locationX>
-        <locationY>818</locationY>
+        <locationY>926</locationY>
         <connector>
-            <targetReference>UpdateOpportunityLineItem</targetReference>
+            <targetReference>SetMembershipFinderRanFlag</targetReference>
         </connector>
         <inputAssignments>
             <field>Flow_Name__c</field>
@@ -285,7 +285,7 @@
         <name>Create_UpdateOpportunityLineItem_Membership_Essentials_Log</name>
         <label>Create &quot;UpdateOpportunityLineItem&quot; Membership Essentials Log</label>
         <locationX>842</locationX>
-        <locationY>1118</locationY>
+        <locationY>1442</locationY>
         <inputAssignments>
             <field>Flow_Name__c</field>
             <value>
@@ -308,11 +308,53 @@
         <storeOutputAutomatically>true</storeOutputAutomatically>
     </recordCreates>
     <recordLookups>
-        <description>Query for a Membership record where Account__c = Opportunity.AccountId where End_Date__c &gt; today</description>
+        <name>Get_Matching_Products</name>
+        <label>Get Matching Products</label>
+        <locationX>314</locationX>
+        <locationY>494</locationY>
+        <assignNullValuesIfNoRecordsFound>false</assignNullValuesIfNoRecordsFound>
+        <connector>
+            <targetReference>Matching_Product_ID_List</targetReference>
+        </connector>
+        <filterLogic>and</filterLogic>
+        <filters>
+            <field>IsActive</field>
+            <operator>EqualTo</operator>
+            <value>
+                <booleanValue>true</booleanValue>
+            </value>
+        </filters>
+        <filters>
+            <field>Category__c</field>
+            <operator>EqualTo</operator>
+            <value>
+                <elementReference>GetOpportunityProduct.Product2.Category__c</elementReference>
+            </value>
+        </filters>
+        <filters>
+            <field>Family</field>
+            <operator>EqualTo</operator>
+            <value>
+                <stringValue>Membership</stringValue>
+            </value>
+        </filters>
+        <filters>
+            <field>Renewal_Option__c</field>
+            <operator>EqualTo</operator>
+            <value>
+                <stringValue>Renewable</stringValue>
+            </value>
+        </filters>
+        <getFirstRecordOnly>false</getFirstRecordOnly>
+        <object>Product2</object>
+        <storeOutputAutomatically>true</storeOutputAutomatically>
+    </recordLookups>
+    <recordLookups>
+        <description>Query for a Membership record where Account__c = Opportunity.AccountId where End_Date__c &gt; today and the Product is a match; If more than one is found, uses the oldest record.</description>
         <name>GetMembership</name>
         <label>GetMembership</label>
         <locationX>314</locationX>
-        <locationY>494</locationY>
+        <locationY>710</locationY>
         <assignNullValuesIfNoRecordsFound>false</assignNullValuesIfNoRecordsFound>
         <connector>
             <targetReference>MembershipPresent</targetReference>
@@ -335,9 +377,18 @@
                 <elementReference>FormulaToday</elementReference>
             </value>
         </filters>
+        <filters>
+            <field>Product__c</field>
+            <operator>In</operator>
+            <value>
+                <elementReference>Matching_Product_ID_List</elementReference>
+            </value>
+        </filters>
         <getFirstRecordOnly>true</getFirstRecordOnly>
         <object>Membership__c</object>
         <queriedFields>Id</queriedFields>
+        <sortField>CreatedDate</sortField>
+        <sortOrder>Asc</sortOrder>
         <storeOutputAutomatically>true</storeOutputAutomatically>
     </recordLookups>
     <recordLookups>
@@ -349,7 +400,7 @@ Return Opportunity.AccountId</description>
         <locationY>386</locationY>
         <assignNullValuesIfNoRecordsFound>false</assignNullValuesIfNoRecordsFound>
         <connector>
-            <targetReference>GetMembership</targetReference>
+            <targetReference>Get_Matching_Products</targetReference>
         </connector>
         <faultConnector>
             <targetReference>Create_GetOpportunity_Membership_Essentials_Log</targetReference>
@@ -401,7 +452,7 @@ Return the Opportunity</description>
         <name>UpdateOpportunityLineItem</name>
         <label>UpdateOpportunityLineItem</label>
         <locationX>314</locationX>
-        <locationY>1010</locationY>
+        <locationY>1334</locationY>
         <connector>
             <targetReference>Create_Membership_Essentials_Log_Pass</targetReference>
         </connector>
@@ -420,6 +471,26 @@ Return the Opportunity</description>
         <triggerType>PlatformEvent</triggerType>
     </start>
     <status>Active</status>
+    <transforms>
+        <name>Matching_Product_ID_List</name>
+        <label>Matching Product ID List</label>
+        <locationX>314</locationX>
+        <locationY>602</locationY>
+        <connector>
+            <targetReference>GetMembership</targetReference>
+        </connector>
+        <dataType>String</dataType>
+        <isCollection>true</isCollection>
+        <scale>0</scale>
+        <transformValues>
+            <transformValueActions>
+                <transformType>Map</transformType>
+                <value>
+                    <elementReference>Get_Matching_Products[$EachItem].Id</elementReference>
+                </value>
+            </transformValueActions>
+        </transformValues>
+    </transforms>
     <variables>
         <description>Variable to hold Opportunity Line item to be updated</description>
         <name>OpportunityProductforUpdate</name>

From ca523f592224d2c58b85e80783cc34920e68763c Mon Sep 17 00:00:00 2001
From: jenncarneiro <jennifer@passionfruitpartners.com>
Date: Thu, 31 Jul 2025 12:46:54 -0400
Subject: [PATCH 3/5] Updated decision criteria to continue if a membership
 value is populated and the membership finder has been run;

---
 .../BPEV_Listener_Membership_Transaction.flow-meta.xml     | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/force-app/main/default/flows/BPEV_Listener_Membership_Transaction.flow-meta.xml b/force-app/main/default/flows/BPEV_Listener_Membership_Transaction.flow-meta.xml
index ea043b7..2343724 100644
--- a/force-app/main/default/flows/BPEV_Listener_Membership_Transaction.flow-meta.xml
+++ b/force-app/main/default/flows/BPEV_Listener_Membership_Transaction.flow-meta.xml
@@ -179,10 +179,10 @@
                 </rightValue>
             </conditions>
             <conditions>
-                <leftValueReference>Query_for_Opportunity_Line_Item.Membership_Finder_Ran__c</leftValueReference>
+                <leftValueReference>Get_New_Product_ID.Family</leftValueReference>
                 <operator>EqualTo</operator>
                 <rightValue>
-                    <booleanValue>false</booleanValue>
+                    <stringValue>Membership</stringValue>
                 </rightValue>
             </conditions>
             <connector>
@@ -449,9 +449,6 @@
         <filters>
             <field>Id</field>
             <operator>EqualTo</operator>
-            <value>
-                <elementReference>$Record.Record_Id__c</elementReference>
-            </value>
         </filters>
         <getFirstRecordOnly>true</getFirstRecordOnly>
         <object>OpportunityLineItem</object>

From 8fcd38cf7b44690340181c414bc685794c4a1ef7 Mon Sep 17 00:00:00 2001
From: jenncarneiro <jennifer@passionfruitpartners.com>
Date: Thu, 31 Jul 2025 13:59:23 -0400
Subject: [PATCH 4/5] update the matching for existing memberships to look for
 similar products, not just ones with the same ID (same category)

Flow updates included:
BPEV_Listener_Membership_Transaction - reset to way it was this morning
DPEV_Listener_Create_Opportunity- reset to way it was this morning
DPEV_Listener_Membership_Finder - updates made
DPEV_Listener_Membership_Upgrade- reset to way it was this morning
---
 ...tener_Membership_Transaction.flow-meta.xml |  7 +++--
 ...V_Listener_Membership_Finder.flow-meta.xml | 31 +++++++++----------
 2 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/force-app/main/default/flows/BPEV_Listener_Membership_Transaction.flow-meta.xml b/force-app/main/default/flows/BPEV_Listener_Membership_Transaction.flow-meta.xml
index 2343724..ea043b7 100644
--- a/force-app/main/default/flows/BPEV_Listener_Membership_Transaction.flow-meta.xml
+++ b/force-app/main/default/flows/BPEV_Listener_Membership_Transaction.flow-meta.xml
@@ -179,10 +179,10 @@
                 </rightValue>
             </conditions>
             <conditions>
-                <leftValueReference>Get_New_Product_ID.Family</leftValueReference>
+                <leftValueReference>Query_for_Opportunity_Line_Item.Membership_Finder_Ran__c</leftValueReference>
                 <operator>EqualTo</operator>
                 <rightValue>
-                    <stringValue>Membership</stringValue>
+                    <booleanValue>false</booleanValue>
                 </rightValue>
             </conditions>
             <connector>
@@ -449,6 +449,9 @@
         <filters>
             <field>Id</field>
             <operator>EqualTo</operator>
+            <value>
+                <elementReference>$Record.Record_Id__c</elementReference>
+            </value>
         </filters>
         <getFirstRecordOnly>true</getFirstRecordOnly>
         <object>OpportunityLineItem</object>
diff --git a/force-app/main/default/flows/DPEV_Listener_Membership_Finder.flow-meta.xml b/force-app/main/default/flows/DPEV_Listener_Membership_Finder.flow-meta.xml
index 01435e1..4443ebc 100644
--- a/force-app/main/default/flows/DPEV_Listener_Membership_Finder.flow-meta.xml
+++ b/force-app/main/default/flows/DPEV_Listener_Membership_Finder.flow-meta.xml
@@ -40,7 +40,7 @@
         <name>SetMembershipFinderRanFlag</name>
         <label>SetMembershipFinderRanFlag</label>
         <locationX>314</locationX>
-        <locationY>1226</locationY>
+        <locationY>926</locationY>
         <assignmentItems>
             <assignToReference>OpportunityProductforUpdate.Membership_Finder_Ran__c</assignToReference>
             <operator>Assign</operator>
@@ -49,7 +49,7 @@
             </value>
         </assignmentItems>
         <connector>
-            <targetReference>UpdateOpportunityLineItem</targetReference>
+            <targetReference>Create_Membership_Essentials_Log_Pass1</targetReference>
         </connector>
     </assignments>
     <decisions>
@@ -85,7 +85,7 @@
                 </rightValue>
             </conditions>
             <connector>
-                <targetReference>Create_Membership_Essentials_Log_Pass1</targetReference>
+                <targetReference>SetMembershipFinderRanFlag</targetReference>
             </connector>
             <label>Membership not found</label>
         </rules>
@@ -125,7 +125,7 @@
         <locationX>50</locationX>
         <locationY>1034</locationY>
         <connector>
-            <targetReference>SetMembershipFinderRanFlag</targetReference>
+            <targetReference>UpdateOpportunityLineItem</targetReference>
         </connector>
         <inputAssignments>
             <field>Flow_Name__c</field>
@@ -230,7 +230,7 @@
         <name>Create_Membership_Essentials_Log_Pass</name>
         <label>Create Membership Essentials Log - Pass</label>
         <locationX>314</locationX>
-        <locationY>1442</locationY>
+        <locationY>1334</locationY>
         <inputAssignments>
             <field>Flow_Name__c</field>
             <value>
@@ -256,9 +256,9 @@
         <name>Create_Membership_Essentials_Log_Pass1</name>
         <label>Create Membership Essentials Log - Pass</label>
         <locationX>314</locationX>
-        <locationY>926</locationY>
+        <locationY>1034</locationY>
         <connector>
-            <targetReference>SetMembershipFinderRanFlag</targetReference>
+            <targetReference>UpdateOpportunityLineItem</targetReference>
         </connector>
         <inputAssignments>
             <field>Flow_Name__c</field>
@@ -285,7 +285,7 @@
         <name>Create_UpdateOpportunityLineItem_Membership_Essentials_Log</name>
         <label>Create &quot;UpdateOpportunityLineItem&quot; Membership Essentials Log</label>
         <locationX>842</locationX>
-        <locationY>1442</locationY>
+        <locationY>1334</locationY>
         <inputAssignments>
             <field>Flow_Name__c</field>
             <value>
@@ -308,13 +308,14 @@
         <storeOutputAutomatically>true</storeOutputAutomatically>
     </recordCreates>
     <recordLookups>
+        <description>Get Active Renewable membership products that are a match for category. Tier will be compared later.</description>
         <name>Get_Matching_Products</name>
         <label>Get Matching Products</label>
         <locationX>314</locationX>
         <locationY>494</locationY>
         <assignNullValuesIfNoRecordsFound>false</assignNullValuesIfNoRecordsFound>
         <connector>
-            <targetReference>Matching_Product_ID_List</targetReference>
+            <targetReference>Matching_Product_Id_List</targetReference>
         </connector>
         <filterLogic>and</filterLogic>
         <filters>
@@ -350,7 +351,7 @@
         <storeOutputAutomatically>true</storeOutputAutomatically>
     </recordLookups>
     <recordLookups>
-        <description>Query for a Membership record where Account__c = Opportunity.AccountId where End_Date__c &gt; today and the Product is a match; If more than one is found, uses the oldest record.</description>
+        <description>Query for a Membership record where Account__c = Opportunity.AccountId where End_Date__c &gt; today</description>
         <name>GetMembership</name>
         <label>GetMembership</label>
         <locationX>314</locationX>
@@ -381,14 +382,12 @@
             <field>Product__c</field>
             <operator>In</operator>
             <value>
-                <elementReference>Matching_Product_ID_List</elementReference>
+                <elementReference>Matching_Product_Id_List</elementReference>
             </value>
         </filters>
         <getFirstRecordOnly>true</getFirstRecordOnly>
         <object>Membership__c</object>
         <queriedFields>Id</queriedFields>
-        <sortField>CreatedDate</sortField>
-        <sortOrder>Asc</sortOrder>
         <storeOutputAutomatically>true</storeOutputAutomatically>
     </recordLookups>
     <recordLookups>
@@ -452,7 +451,7 @@ Return the Opportunity</description>
         <name>UpdateOpportunityLineItem</name>
         <label>UpdateOpportunityLineItem</label>
         <locationX>314</locationX>
-        <locationY>1334</locationY>
+        <locationY>1226</locationY>
         <connector>
             <targetReference>Create_Membership_Essentials_Log_Pass</targetReference>
         </connector>
@@ -472,8 +471,8 @@ Return the Opportunity</description>
     </start>
     <status>Active</status>
     <transforms>
-        <name>Matching_Product_ID_List</name>
-        <label>Matching Product ID List</label>
+        <name>Matching_Product_Id_List</name>
+        <label>Matching Product Id List</label>
         <locationX>314</locationX>
         <locationY>602</locationY>
         <connector>

From 0cc728f65af59e4601079ffceedbf04fd2234961 Mon Sep 17 00:00:00 2001
From: jenncarneiro <jennifer@passionfruitpartners.com>
Date: Thu, 31 Jul 2025 14:18:54 -0400
Subject: [PATCH 5/5] update the matching for existing memberships to look for
 similar products, not just ones with the same ID (same category)

---
 .../default/flows/DPEV_Listener_Membership_Finder.flow-meta.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/force-app/main/default/flows/DPEV_Listener_Membership_Finder.flow-meta.xml b/force-app/main/default/flows/DPEV_Listener_Membership_Finder.flow-meta.xml
index 4443ebc..2d1f47f 100644
--- a/force-app/main/default/flows/DPEV_Listener_Membership_Finder.flow-meta.xml
+++ b/force-app/main/default/flows/DPEV_Listener_Membership_Finder.flow-meta.xml
@@ -90,7 +90,7 @@
             <label>Membership not found</label>
         </rules>
     </decisions>
-    <description>Find membership associated with Opportunity Line Item and Account or mark Membership Form Submission Record to indicate that the finder ran.</description>
+    <description>Find existing membership associated with Opportunity Line Item and Account or mark Membership Form Submission Record to indicate that the finder ran.</description>
     <environments>Default</environments>
     <formulas>
         <description>Returns today&apos;s date</description>