Merge pull request #89 from linuxfoundation/feat/map-sfdc-funding

feat(projects): sync SFDC funding__c to v2 funding attribute

Author: asithade

cmd/lfx-v1-sync-helper/client_projects.go

@@ -93,6 +93,7 @@ func updateProject(ctx context.Context, basePayload *projectservice.UpdateProjec
 		ParentUID:                  stringToStringPtr(basePayload.ParentUID),
 		Stage:                      basePayload.Stage,
 		Category:                   basePayload.Category,
+		Funding:                    basePayload.Funding,
 		FundingModel:               basePayload.FundingModel,
 		CharterURL:                 basePayload.CharterURL,
 		LegalEntityType:            basePayload.LegalEntityType,
@@ -213,6 +214,7 @@ func projectBasesEqual(a, b *projectservice.ProjectBase) bool {
 		stringPtrToString(a.ParentUID) == stringPtrToString(b.ParentUID) &&
 		stringPtrToString(a.Stage) == stringPtrToString(b.Stage) &&
 		stringPtrToString(a.Category) == stringPtrToString(b.Category) &&
+		stringPtrToString(a.Funding) == stringPtrToString(b.Funding) &&
 		stringSliceEqual(a.FundingModel, b.FundingModel) &&
 		stringPtrToString(a.CharterURL) == stringPtrToString(b.CharterURL) &&
 		stringPtrToString(a.LegalEntityType) == stringPtrToString(b.LegalEntityType) &&

cmd/lfx-v1-sync-helper/handlers_projects.go

@@ -302,6 +302,11 @@ func mapV1DataToProjectCreatePayload(ctx context.Context, v1Data map[string]any)
 		payload.LegalEntityType = &category
 	}
 
+	// Map funding status.
+	if funding, ok := v1Data["funding__c"].(string); ok && funding != "" {
+		payload.Funding = &funding
+	}
+
 	// Map funding model (split semicolon-delimited values).
 	if model, ok := v1Data["model__c"].(string); ok && model != "" {
 		models := strings.Split(model, ";")
@@ -478,6 +483,11 @@ func mapV1DataToProjectUpdateBasePayload(ctx context.Context, projectUID string,
 		payload.LegalEntityType = &category
 	}
 
+	// Map funding status.
+	if funding, ok := v1Data["funding__c"].(string); ok && funding != "" {
+		payload.Funding = &funding
+	}
+
 	// Map funding model (split semicolon-delimited values).
 	if model, ok := v1Data["model__c"].(string); ok && model != "" {
 		models := strings.Split(model, ";")

go.mod

@@ -17,7 +17,7 @@ require (
 	github.com/golang-jwt/jwt/v5 v5.3.1
 	github.com/google/uuid v1.6.0
 	github.com/linuxfoundation/lfx-v2-committee-service v0.2.22
-	github.com/linuxfoundation/lfx-v2-project-service v0.6.3
+	github.com/linuxfoundation/lfx-v2-project-service v0.6.4
 	github.com/nats-io/nats.go v1.48.0
 	github.com/opensearch-project/opensearch-go/v4 v4.5.0
 	github.com/patrickmn/go-cache v2.1.0+incompatible

go.sum

@@ -82,6 +82,8 @@ github.com/linuxfoundation/lfx-v2-project-service v0.6.1 h1:Cv2a0qGFYriC3Rwjo3cX
 github.com/linuxfoundation/lfx-v2-project-service v0.6.1/go.mod h1:pwUWh2KKmV8Ji+wCSrlidvZC7VOn0gVCfSFv7Cyoe5o=
 github.com/linuxfoundation/lfx-v2-project-service v0.6.3 h1:FUTmSvhtbbIyIEIu4nszi3C7Gs5OyLCaxs9jNCyWY9E=
 github.com/linuxfoundation/lfx-v2-project-service v0.6.3/go.mod h1:3ULEcvKwHWcBcMxSW3yeMPGqk5+tnu2X+FjcaAw9Fy4=
+github.com/linuxfoundation/lfx-v2-project-service v0.6.4 h1:Odv+Ls1EjomnyAdSG3NSZGJ+wibyJCqCPY6xdIDljG8=
+github.com/linuxfoundation/lfx-v2-project-service v0.6.4/go.mod h1:3ULEcvKwHWcBcMxSW3yeMPGqk5+tnu2X+FjcaAw9Fy4=
 github.com/nats-io/nats.go v1.48.0 h1:pSFyXApG+yWU/TgbKCjmm5K4wrHu86231/w84qRVR+U=
 github.com/nats-io/nats.go v1.48.0/go.mod h1:iRWIPokVIFbVijxuMQq4y9ttaBTMe0SFdlZfMDd+33g=
 github.com/nats-io/nkeys v0.4.15 h1:JACV5jRVO9V856KOapQ7x+EY8Jo3qw1vJt/9Jpwzkk4=