Merge branch 'master' of github.com:Evolveum/midpoint

Evolveum · Aug 25, 2023 · b0ab886 · b0ab886
2 parents 208cc0d + ea2c148
commit b0ab886
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 2 deletions.
diff --git a/config/sql/native-new/postgres-new-upgrade.sql b/config/sql/native-new/postgres-new-upgrade.sql
@@ -376,6 +376,11 @@ ALTER TABLE m_task_affected_objects
   ADD COLUMN predefinedConfigurationToUse PredefinedConfigurationType;
 $aa$);
 
+call apply_change(21, $aa$
+ALTER TABLE m_user
+  ADD COLUMN personalNumber TEXT;
+$aa$);
+
 
 ---
 -- WRITE CHANGES ABOVE ^^

diff --git a/config/sql/native-new/postgres-new.sql b/config/sql/native-new/postgres-new.sql
@@ -575,6 +575,7 @@ CREATE TABLE m_user (
     honorificSuffixNorm TEXT,
     nickNameOrig TEXT,
     nickNameNorm TEXT,
+    personalNumber TEXT,
     titleOrig TEXT,
     titleNorm TEXT,
     organizations JSONB, -- array of {o,n} objects (poly-strings)
@@ -2116,4 +2117,4 @@ END $$;
 -- This is important to avoid applying any change more than once.
 -- Also update SqaleUtils.CURRENT_SCHEMA_CHANGE_NUMBER
 -- repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/SqaleUtils.java
-call apply_change(20, $$ SELECT 1 $$, true);
+call apply_change(21, $$ SELECT 1 $$, true);
diff --git a/repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/SqaleUtils.java b/repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/SqaleUtils.java
@@ -38,7 +38,7 @@ public class SqaleUtils {
      */
     public static final String SCHEMA_AUDIT_CHANGE_NUMBER = "schemaAuditChangeNumber";
 
-    public static final int CURRENT_SCHEMA_CHANGE_NUMBER = 20;
+    public static final int CURRENT_SCHEMA_CHANGE_NUMBER = 21;
 
     public static final int CURRENT_SCHEMA_AUDIT_CHANGE_NUMBER = 6;
 

diff --git a/repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/qmodel/focus/MUser.java b/repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/qmodel/focus/MUser.java
@@ -28,6 +28,7 @@ public class MUser extends MFocus {
     public String honorificSuffixNorm;
     public String nickNameOrig;
     public String nickNameNorm;
+    public String personalNumber;
     public String titleOrig;
     public String titleNorm;
     public Jsonb organizations;

diff --git a/repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/qmodel/focus/QUser.java b/repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/qmodel/focus/QUser.java
@@ -63,6 +63,7 @@ public class QUser extends QFocus<MUser> {
             ColumnMetadata.named("organizations").ofType(JSONB_TYPE);
     public static final ColumnMetadata ORGANIZATION_UNITS =
             ColumnMetadata.named("organizationUnits").ofType(JSONB_TYPE);
+    private static final ColumnMetadata PERSONAL_NUMBER = ColumnMetadata.named("personalNumber").ofType(Types.VARCHAR);
 
     public final StringPath additionalNameOrig = createString("additionalNameOrig", ADDITIONAL_NAME_ORIG);
     public final StringPath additionalNameNorm = createString("additionalNameNorm", ADDITIONAL_NAME_NORM);
@@ -86,6 +87,8 @@ public class QUser extends QFocus<MUser> {
     public final JsonbPath organizationUnits =
             addMetadata(add(new JsonbPath(forProperty("organizationUnits"))), ORGANIZATION_UNITS);
 
+    public StringPath personalNumber = createString("personalNumber", PERSONAL_NUMBER);
+
     public QUser(String variable) {
         this(variable, DEFAULT_SCHEMA_NAME, TABLE_NAME);
     }

diff --git a/.../repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/qmodel/focus/QUserMapping.java b/.../repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/qmodel/focus/QUserMapping.java
@@ -45,6 +45,7 @@ private QUserMapping(@NotNull SqaleRepoContext repositoryContext) {
         addItemMapping(F_ADDITIONAL_NAME, polyStringMapper(
                 q -> q.additionalNameOrig, q -> q.additionalNameNorm));
         addItemMapping(F_EMPLOYEE_NUMBER, stringMapper(q -> q.employeeNumber));
+        addItemMapping(F_PERSONAL_NUMBER, stringMapper(q -> q.personalNumber));
         addItemMapping(F_FAMILY_NAME, polyStringMapper(
                 q -> q.familyNameOrig, q -> q.familyNameNorm));
         addItemMapping(F_FULL_NAME, polyStringMapper(
@@ -81,6 +82,7 @@ public MUser newRowObject() {
         setPolyString(user.getAdditionalName(),
                 o -> row.additionalNameOrig = o, n -> row.additionalNameNorm = n);
         row.employeeNumber = user.getEmployeeNumber();
+        row.personalNumber = user.getPersonalNumber();
         setPolyString(user.getFamilyName(),
                 o -> row.familyNameOrig = o, n -> row.familyNameNorm = n);
         setPolyString(user.getFullName(), o -> row.fullNameOrig = o, n -> row.fullNameNorm = n);

diff --git a/repo/repo-sqale/src/test/java/com/evolveum/midpoint/repo/sqale/func/SqaleRepoSearchTest.java b/repo/repo-sqale/src/test/java/com/evolveum/midpoint/repo/sqale/func/SqaleRepoSearchTest.java
@@ -252,6 +252,7 @@ public void initObjects() throws Exception {
                 .subtype("workerA")
                 .subtype("workerC")
                 .employeeNumber("user1")
+                .personalNumber("personal1")
                 .policySituation("situationA")
                 .policySituation("situationC")
                 .activation(new ActivationType()
@@ -3288,6 +3289,16 @@ public void test991SearchObjectWithStringIgnoreCaseWithoutNamespace()
                 user1Oid);
     }
 
+    @Test(description = "MID-8005")
+    public void test992SearchObjectWithStringIgnoreCaseWithoutNamespace()
+            throws SchemaException {
+        searchUsersTest("with string item matching ignore-case comparison",
+                f -> f.item(UserType.F_PERSONAL_NUMBER).contains("Personal1")
+                        // Use QName without namespace
+                        .matching(new QName(STRING_IGNORE_CASE_MATCHING_RULE_NAME.getLocalPart())),
+                user1Oid);
+    }
+
     @Test
     public void test992FuzzyStringSearch() throws SchemaException {
         searchUsersTest("with levenshtein filter against string item",