graphql query

coolsamson7 · Oct 11, 2024 · a509c63 · a509c63
1 parent 7e9611c
commit a509c63
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 16 deletions.
diff --git a/dorm/core/src/main/kotlin/org/sirius/dorm/json/ObjectDeserializer.kt b/dorm/core/src/main/kotlin/org/sirius/dorm/json/ObjectDeserializer.kt
@@ -13,7 +13,6 @@ import org.sirius.dorm.ObjectManager
 import org.sirius.dorm.model.ObjectDescriptor
 import org.sirius.dorm.model.PropertyDescriptor
 import org.sirius.dorm.`object`.DataObject
-import org.sirius.dorm.transaction.Status
 import java.util.*
 import java.util.concurrent.ConcurrentHashMap
 
@@ -126,7 +125,7 @@ class JSONReader(private val objectDescriptor: ObjectDescriptor) {
             else return { node, obj, deserializer, context ->
                 val target = property.asRelation().targetDescriptor!!
 
-                if ( property.asRelation().multiplicity.mutliValued) {
+                if ( property.asRelation().multiplicity.multiValued) {
                     // multivalued
 
                     val array =  node.get(property.name)

diff --git a/dorm/core/src/main/kotlin/org/sirius/dorm/json/ObjectSerializer.kt b/dorm/core/src/main/kotlin/org/sirius/dorm/json/ObjectSerializer.kt
@@ -125,7 +125,7 @@ class JSONWriter(private val objectDescriptor: ObjectDescriptor) {
                     }
                 }
             else {
-                if ( property.asRelation().multiplicity.mutliValued) {
+                if ( property.asRelation().multiplicity.multiValued) {
                     return { serializer, jsonGenerator, obj, context ->
                         val value = obj.relation(property.index)
 

diff --git a/dorm/core/src/main/kotlin/org/sirius/dorm/model/Multiplicity.kt b/dorm/core/src/main/kotlin/org/sirius/dorm/model/Multiplicity.kt
@@ -4,7 +4,7 @@ package org.sirius.dorm.model
  *
  * All rights reserved
  */
-enum class Multiplicity(val optional: Boolean, val mutliValued: Boolean) {
+enum class Multiplicity(val optional: Boolean, val multiValued: Boolean) {
     ZERO_OR_ONE(true, false),
     ONE(false, false),
     MANY(false, true),

diff --git a/dorm/core/src/main/kotlin/org/sirius/dorm/model/RelationDescriptor.kt b/dorm/core/src/main/kotlin/org/sirius/dorm/model/RelationDescriptor.kt
@@ -22,7 +22,7 @@ open class RelationDescriptor<T:Any>(name: String, val target: String, val multi
     // override
 
     override fun createProperty(obj: DataObject, status: Status, entity: PropertyEntity?) : Property {
-        val relation =  if ( multiplicity.mutliValued ) MultiValuedRelation(
+        val relation =  if ( multiplicity.multiValued ) MultiValuedRelation(
             this,
             status,
             obj,

diff --git a/dorm/graphql/src/main/kotlin/org/sirius/dorm/graphql/ObjectMutator.kt b/dorm/graphql/src/main/kotlin/org/sirius/dorm/graphql/ObjectMutator.kt
@@ -63,7 +63,7 @@ class ObjectMutator(val objectManager: ObjectManager) {
                 obj[key] = coerce(input[key]!!, property.asAttribute())
 
             else {
-                if ( property.asRelation().multiplicity.mutliValued) {
+                if ( property.asRelation().multiplicity.multiValued) {
                     val array = input[key] as Collection<Map<String,Any>>
 
                     // recursion

diff --git a/dorm/graphql/src/main/kotlin/org/sirius/dorm/graphql/QueryBuilder.kt b/dorm/graphql/src/main/kotlin/org/sirius/dorm/graphql/QueryBuilder.kt
@@ -107,11 +107,11 @@ class QueryBuilder(val objectManager: ObjectManager) {
                 }
             }
             else {
-                if (!property.asRelation().multiplicity.mutliValued) {
+                //if (!property.asRelation().multiplicity.multiValued) {
                     return buildExpression(root.get(property.name) as AbstractFrom, filter.get(key) as Map<String, Any>)
-                }
-                else
-                    throw Error("NYS")
+                //}
+                //else
+                //    throw Error("NYS")
             }
         }
     }

diff --git a/dorm/graphql/src/main/kotlin/org/sirius/dorm/graphql/SchemaBuilder.kt b/dorm/graphql/src/main/kotlin/org/sirius/dorm/graphql/SchemaBuilder.kt
@@ -77,7 +77,7 @@ class SchemaBuilder(val objectManager: ObjectManager) {
                             .type(type4<GraphQLOutputType>(field.asAttribute().baseType(), false))
                     )
                 else {
-                    if ( field.asRelation().multiplicity.mutliValued) {
+                    if ( field.asRelation().multiplicity.multiValued) {
                         newObject.field(
                             GraphQLFieldDefinition.newFieldDefinition()
                                 .name(field.name)
@@ -114,7 +114,7 @@ class SchemaBuilder(val objectManager: ObjectManager) {
                             .type(type4<GraphQLInputType>(field.asAttribute().baseType(), true))
                     )
                 else {
-                    if ( field.asRelation().multiplicity.mutliValued) {
+                    if ( field.asRelation().multiplicity.multiValued) {
                         inputObject.field(
                             GraphQLInputObjectField.newInputObjectField()
                                 .name(field.name)
@@ -179,13 +179,13 @@ class SchemaBuilder(val objectManager: ObjectManager) {
                     )
                 }
                 else {
-                    if ( !property.asRelation().multiplicity.mutliValued) {
+                    //if ( !property.asRelation().multiplicity.multiValued) {
                         filterBuilder.field(
                             GraphQLInputObjectField.newInputObjectField()
                                 .name(property.name)
                                 .type(GraphQLTypeReference.typeRef("${property.asRelation().target}Filter"))
                         )
-                    }
+                    //}
                 }
             }
 

diff --git a/dorm/graphql/src/main/kotlin/org/sirius/dorm/graphql/TODO-GRAPHQL.TXT b/dorm/graphql/src/main/kotlin/org/sirius/dorm/graphql/TODO-GRAPHQL.TXT
@@ -1,7 +1,5 @@
 === TODO
 
-- admin servicefinalisieren
-
 - sql sieht komisch aus
 - parser + like
 - projektion mit id geht nicht weil kein join!
@@ -11,13 +9,15 @@
 
 === LATER
 
+- admin service CRUD
 - kopieren nach service :-)
 - angular :-) mit builder simple
 
 === NOW
 
 === DONE
 
+- admin service finalisieren
 - TODOs in MVR
 - join children geht, father nicht :-)
 - like