Condition syntax with boolean, ModelPermissions alternate constructors

lightningkite · Oct 20, 2023 · cc0a4d7 · cc0a4d7
1 parent 594599b
commit cc0a4d7
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 0 deletions.
diff --git a/server-core/src/main/kotlin/com/lightningkite/lightningdb/ModelPermissions.kt b/server-core/src/main/kotlin/com/lightningkite/lightningdb/ModelPermissions.kt
@@ -44,6 +44,33 @@ data class ModelPermissions<Model>(
             delete = Condition.Always(),
         )
     }
+
+    constructor(
+        read: Condition<Model>,
+        readMask: Mask<Model> = Mask(),
+        manage: Condition<Model>,
+        updateRestriction: UpdateRestrictions<Model> = UpdateRestrictions(),
+    ) : this(
+        create = manage,
+        update = manage,
+        updateRestrictions = updateRestriction,
+        read = read,
+        readMask = readMask,
+        delete = manage
+    )
+    constructor(
+        all: Condition<Model>,
+        readMask: Mask<Model> = Mask(),
+        updateRestriction: UpdateRestrictions<Model> = UpdateRestrictions(),
+    ) : this(
+        create = all,
+        update = all,
+        updateRestrictions = updateRestriction,
+        read = all,
+        readMask = readMask,
+        delete = all
+    )
+
     /**
      * @return a condition defining under what circumstances the given [modification] is permitted in.
      */

diff --git a/shared/src/commonMain/kotlin/com/lightningkite/lightningdb/ConditionBuilder.kt b/shared/src/commonMain/kotlin/com/lightningkite/lightningdb/ConditionBuilder.kt
@@ -10,11 +10,13 @@ inline fun <reified T : IsCodableAndHashable> path(): DataClassPath<T, T> = Data
 
 inline fun <reified T : IsCodableAndHashable> condition(setup: (DataClassPath<T, T>) -> Condition<T>): Condition<T> =
     path<T>().let(setup)
+fun <T> condition(boolean: Boolean): Condition<T> = if(boolean) Condition.Always() else Condition.Never()
 
 val <K : IsCodableAndHashable> DataClassPath<K, K>.always: Condition<K> get() = Condition.Always<K>()
 val <K : IsCodableAndHashable> DataClassPath<K, K>.never: Condition<K> get() = Condition.Never<K>()
 
 infix fun <K : IsCodableAndHashable, T : IsCodableAndHashable> DataClassPath<K, T>.eq(value: T) = mapCondition(Condition.Equal(value))
+infix fun <K : IsCodableAndHashable, T : IsCodableAndHashableNotNull> DataClassPath<K, T>.eqNn(value: T?) = if(value == null) Condition.Never() else mapCondition(Condition.Equal(value))
 infix fun <K : IsCodableAndHashable, T : IsCodableAndHashable> DataClassPath<K, T>.neq(value: T) = mapCondition(Condition.NotEqual(value))
 @JsName("xDataClassPathNotInSet") infix fun <K : IsCodableAndHashable, T : IsCodableAndHashable> DataClassPath<K, T>.notInside(values: Set<T>) = mapCondition(Condition.NotInside(values.toList()))
 infix fun <K : IsCodableAndHashable, T : IsCodableAndHashable> DataClassPath<K, T>.notInside(values: List<T>) = mapCondition(Condition.NotInside(values))