chore(graph/education): deduplicate LDAP Search result processing

Author: rhafer

services/graph/pkg/identity/ldap_education_school.go

@@ -356,43 +356,11 @@ func (i *LDAP) GetEducationSchool(ctx context.Context, numberOrID string) (*libr
 
 // GetEducationSchools implements the EducationBackend interface for the LDAP backend.
 func (i *LDAP) GetEducationSchools(ctx context.Context) ([]*libregraph.EducationSchool, error) {
-	var filter string
-	filter = fmt.Sprintf("(objectClass=%s)", i.educationConfig.schoolObjectClass)
-
+	filter := fmt.Sprintf("(objectClass=%s)", i.educationConfig.schoolObjectClass)
 	if i.educationConfig.schoolFilter != "" {
 		filter = fmt.Sprintf("(&%s%s)", i.educationConfig.schoolFilter, filter)
 	}
-
-	searchRequest := ldap.NewSearchRequest(
-		i.educationConfig.schoolBaseDN,
-		i.educationConfig.schoolScope,
-		ldap.NeverDerefAliases, 0, 0, false,
-		filter,
-		i.getEducationSchoolAttrTypes(),
-		nil,
-	)
-	i.logger.Debug().Str("backend", "ldap").
-		Str("base", searchRequest.BaseDN).
-		Str("filter", searchRequest.Filter).
-		Int("scope", searchRequest.Scope).
-		Int("sizelimit", searchRequest.SizeLimit).
-		Interface("attributes", searchRequest.Attributes).
-		Msg("GetEducationSchools")
-	res, err := i.conn.Search(searchRequest)
-	if err != nil {
-		return nil, errorcode.New(errorcode.ItemNotFound, err.Error())
-	}
-
-	schools := make([]*libregraph.EducationSchool, 0, len(res.Entries))
-	for _, e := range res.Entries {
-		school := i.createSchoolModelFromLDAP(e)
-		// Skip invalid LDAP entries
-		if school == nil {
-			continue
-		}
-		schools = append(schools, school)
-	}
-	return schools, nil
+	return i.searchEducationSchools(ctx, filter)
 }
 
 // FilterEducationSchoolsByAttribute implements the EducationBackend interface for the LDAP backend.
@@ -413,7 +381,11 @@ func (i *LDAP) FilterEducationSchoolsByAttribute(ctx context.Context, attr, valu
 		ldap.EscapeFilter(ldapAttr),
 		ldap.EscapeFilter(value),
 	)
+	return i.searchEducationSchools(ctx, filter)
+}
 
+// searchEducationSchools builds and executes an LDAP search for education schools and converts the results to EducationSchool models.
+func (i *LDAP) searchEducationSchools(ctx context.Context, filter string) ([]*libregraph.EducationSchool, error) {
 	searchRequest := ldap.NewSearchRequest(
 		i.educationConfig.schoolBaseDN,
 		i.educationConfig.schoolScope,
@@ -422,12 +394,14 @@ func (i *LDAP) FilterEducationSchoolsByAttribute(ctx context.Context, attr, valu
 		i.getEducationSchoolAttrTypes(),
 		nil,
 	)
-	logger.Debug().Str("base", searchRequest.BaseDN).
+	logger := i.logger.SubloggerWithRequestID(ctx)
+	logger.Debug().Str("backend", "ldap").
+		Str("base", searchRequest.BaseDN).
 		Str("filter", searchRequest.Filter).
 		Int("scope", searchRequest.Scope).
 		Int("sizelimit", searchRequest.SizeLimit).
 		Interface("attributes", searchRequest.Attributes).
-		Msg("LDAP Search Request")
+		Msg("searchEducationSchools")
 
 	res, err := i.conn.Search(searchRequest)
 	if err != nil {
@@ -437,6 +411,7 @@ func (i *LDAP) FilterEducationSchoolsByAttribute(ctx context.Context, attr, valu
 	schools := make([]*libregraph.EducationSchool, 0, len(res.Entries))
 	for _, e := range res.Entries {
 		school := i.createSchoolModelFromLDAP(e)
+		// Skip invalid LDAP entries
 		if school == nil {
 			continue
 		}

services/graph/pkg/identity/ldap_education_user.go

@@ -208,48 +208,13 @@ func (i *LDAP) GetEducationUser(ctx context.Context, nameOrID string) (*libregra
 
 // GetEducationUsers implements the EducationBackend interface for the LDAP backend.
 func (i *LDAP) GetEducationUsers(ctx context.Context) ([]*libregraph.EducationUser, error) {
-	logger := i.logger.SubloggerWithRequestID(ctx)
-	logger.Debug().Str("backend", "ldap").Msg("GetEducationUsers")
-
-	var userFilter string
-
+	var filter string
 	if i.userFilter == "" {
-		userFilter = fmt.Sprintf("(objectClass=%s)", i.educationConfig.userObjectClass)
+		filter = fmt.Sprintf("(objectClass=%s)", i.educationConfig.userObjectClass)
 	} else {
-		userFilter = fmt.Sprintf("(&%s(objectClass=%s))", i.userFilter, i.educationConfig.userObjectClass)
-	}
-
-	searchRequest := ldap.NewSearchRequest(
-		i.userBaseDN,
-		i.userScope,
-		ldap.NeverDerefAliases, 0, 0, false,
-		userFilter,
-		i.getEducationUserAttrTypes(),
-		nil,
-	)
-	logger.Debug().Str("backend", "ldap").
-		Str("base", searchRequest.BaseDN).
-		Str("filter", searchRequest.Filter).
-		Int("scope", searchRequest.Scope).
-		Int("sizelimit", searchRequest.SizeLimit).
-		Interface("attributes", searchRequest.Attributes).
-		Msg("GetEducationUsers")
-	res, err := i.conn.Search(searchRequest)
-	if err != nil {
-		return nil, errorcode.New(errorcode.ItemNotFound, err.Error())
+		filter = fmt.Sprintf("(&%s(objectClass=%s))", i.userFilter, i.educationConfig.userObjectClass)
 	}
-
-	users := make([]*libregraph.EducationUser, 0, len(res.Entries))
-
-	for _, e := range res.Entries {
-		u := i.createEducationUserModelFromLDAP(e)
-		// Skip invalid LDAP users
-		if u == nil {
-			continue
-		}
-		users = append(users, u)
-	}
-	return users, nil
+	return i.searchEducationUsers(ctx, filter)
 }
 
 func (i *LDAP) FilterEducationUsersByAttribute(ctx context.Context, attr, value string) ([]*libregraph.EducationUser, error) {
@@ -272,7 +237,11 @@ func (i *LDAP) FilterEducationUsersByAttribute(ctx context.Context, attr, value
 		return nil, errorcode.New(errorcode.InvalidRequest, fmt.Sprintf("filtering by attribute '%s' is not supported", attr))
 	}
 	filter := fmt.Sprintf("(&%s(objectClass=%s)(%s=%s))", i.userFilter, i.educationConfig.userObjectClass, ldap.EscapeFilter(ldapAttr), ldap.EscapeFilter(value))
+	return i.searchEducationUsers(ctx, filter)
+}
 
+// searchEducationUsers builds and executes an LDAP search for education users and converts the results to EducationUser models.
+func (i *LDAP) searchEducationUsers(ctx context.Context, filter string) ([]*libregraph.EducationUser, error) {
 	searchRequest := ldap.NewSearchRequest(
 		i.userBaseDN,
 		i.userScope,
@@ -281,20 +250,21 @@ func (i *LDAP) FilterEducationUsersByAttribute(ctx context.Context, attr, value
 		i.getEducationUserAttrTypes(),
 		nil,
 	)
-	logger.Debug().Str("base", searchRequest.BaseDN).
+	logger := i.logger.SubloggerWithRequestID(ctx)
+	logger.Debug().Str("backend", "ldap").
+		Str("base", searchRequest.BaseDN).
 		Str("filter", searchRequest.Filter).
 		Int("scope", searchRequest.Scope).
 		Int("sizelimit", searchRequest.SizeLimit).
 		Interface("attributes", searchRequest.Attributes).
-		Msg("LDAP Search Request")
+		Msg("searchEducationUsers")
 
 	res, err := i.conn.Search(searchRequest)
 	if err != nil {
 		return nil, errorcode.New(errorcode.ItemNotFound, err.Error())
 	}
 
 	users := make([]*libregraph.EducationUser, 0, len(res.Entries))
-
 	for _, e := range res.Entries {
 		u := i.createEducationUserModelFromLDAP(e)
 		// Skip invalid LDAP users