From 992ef9c5d7f562ddddebdfad8e30d89d7cb9f1fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20Franke?= Date: Tue, 31 Jan 2023 10:24:27 +0100 Subject: [PATCH] Rename some variables, remove TODO. --- .../pkg/identity/ldap_education_school.go | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/services/graph/pkg/identity/ldap_education_school.go b/services/graph/pkg/identity/ldap_education_school.go index 52804e560..d0a44d8a4 100644 --- a/services/graph/pkg/identity/ldap_education_school.go +++ b/services/graph/pkg/identity/ldap_education_school.go @@ -460,23 +460,23 @@ func (i *LDAP) GetEducationSchoolClasses(ctx context.Context, schoolNumberOrID s logger.Debug().Str("backend", "ldap").Msg("GetEducationSchoolClasses") entries, err := i.getEducationSchoolEntries( - schoolNumberOrID, i.groupFilter, i.educationConfig.classObjectClass, i.groupBaseDN, i.groupScope, i.getEducationClassAttrTypes(false), logger, // TODO: Add attributes + schoolNumberOrID, i.groupFilter, i.educationConfig.classObjectClass, i.groupBaseDN, i.groupScope, i.getEducationClassAttrTypes(false), logger, ) if err != nil { return nil, err } - users := make([]*libregraph.EducationClass, 0, len(entries)) + classes := make([]*libregraph.EducationClass, 0, len(entries)) for _, e := range entries { - u := i.createEducationClassModelFromLDAP(e) + class := i.createEducationClassModelFromLDAP(e) // Skip invalid LDAP classes - if u == nil { + if class == nil { continue } - users = append(users, u) + classes = append(classes, class) } - return users, nil + return classes, nil } func (i *LDAP) getEducationSchoolEntries( @@ -583,15 +583,15 @@ func (i *LDAP) RemoveClassFromEducationSchool(ctx context.Context, schoolNumberO } schoolID := schoolEntry.GetEqualFoldAttributeValue(i.educationConfig.schoolAttributeMap.id) - user, err := i.getEducationClassByID(memberID, false) + class, err := i.getEducationClassByID(memberID, false) if err != nil { i.logger.Warn().Str("userid", memberID).Msg("Class does not exist") return err } - currentSchools := user.GetEqualFoldAttributeValues(i.educationConfig.memberOfSchoolAttribute) + currentSchools := class.GetEqualFoldAttributeValues(i.educationConfig.memberOfSchoolAttribute) for _, currentSchool := range currentSchools { if currentSchool == schoolID { - mr := ldap.ModifyRequest{DN: user.DN} + mr := ldap.ModifyRequest{DN: class.DN} mr.Delete(i.educationConfig.memberOfSchoolAttribute, []string{schoolID}) if err := i.conn.Modify(&mr); err != nil { return err