Merge pull request #76 from mauriciozanettisalomao/feat/lfxv2-1317-resolver-org-website

[LFXV2-1317] Update search parameter from domain to website in organization-service

Author: mauriciozanettisalomao

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

@@ -324,12 +324,12 @@ func getV1OrganizationFromOrgSvc(ctx context.Context, sfid string) (*V1Organizat
 	return org, nil
 }
 
-// searchV1OrgsByDomain searches for organizations in the v1 Organization Service by domain.
+// searchV1OrgsByWebsite searches for organizations in the v1 Organization Service by website.
 // Returns the first matching organization, or nil if none found.
-func searchV1OrgsByDomain(ctx context.Context, domain string) (*V1Organization, error) {
+func searchV1OrgsByWebsite(ctx context.Context, website string) (*V1Organization, error) {
 	baseURL := fmt.Sprintf("%sorganization-service/v1/orgs/search", cfg.LFXAPIGateway.String())
 	params := url.Values{}
-	params.Set("domain", domain)
+	params.Set("website", website)
 	fullURL := baseURL + "?" + params.Encode()
 
 	req, err := http.NewRequestWithContext(ctx, http.MethodGet, fullURL, nil)
@@ -349,7 +349,7 @@ func searchV1OrgsByDomain(ctx context.Context, domain string) (*V1Organization,
 	}
 
 	if resp.StatusCode != http.StatusOK {
-		return nil, fmt.Errorf("org service returned status %d searching by domain=%q: %s", resp.StatusCode, domain, string(body))
+		return nil, fmt.Errorf("org service returned status %d searching by website=%q: %s", resp.StatusCode, website, string(body))
 	}
 
 	var listResp V1OrganizationListResponse
@@ -413,12 +413,12 @@ func createV1OrgInOrgSvc(ctx context.Context, name, website string) (*V1Organiza
 	}, nil
 }
 
-// resolveV1OrgID resolves a v1 Organization SFID by searching by domain first.
-// If not found and both name and domain are provided, it creates a new org.
+// resolveV1OrgID resolves a v1 Organization SFID by searching by website first.
+// If not found and both name and website are provided, it creates a new org.
 // Returns empty string (no error) if the org cannot be found and there is insufficient data to create one.
-func resolveV1OrgID(ctx context.Context, name, domain string) (string, error) {
-	if domain != "" {
-		org, err := searchV1OrgsByDomain(ctx, domain)
+func resolveV1OrgID(ctx context.Context, name, website string) (string, error) {
+	if website != "" {
+		org, err := searchV1OrgsByWebsite(ctx, website)
 		if err != nil {
 			return "", fmt.Errorf("org search failed: %w", err)
 		}
@@ -427,13 +427,13 @@ func resolveV1OrgID(ctx context.Context, name, domain string) (string, error) {
 		}
 	}
 
-	if name == "" || domain == "" {
-		logger.With("name", name, "domain", domain).
+	if name == "" || website == "" {
+		logger.With("name", name, "website", website).
 			DebugContext(ctx, "insufficient data to create v1 organization, skipping org resolution")
 		return "", nil
 	}
 
-	created, err := createV1OrgInOrgSvc(ctx, name, domain)
+	created, err := createV1OrgInOrgSvc(ctx, name, website)
 	if err != nil {
 		return "", fmt.Errorf("org create failed: %w", err)
 	}