add new scope class and schema bugs fixed

gevorg95 · gevorg95 · commit ef76e4b188f5 · 2018-04-17T01:03:41.000+10:00
diff --git a/cls/GraphQL/REST/Main.cls b/cls/GraphQL/REST/Main.cls
@@ -20,11 +20,14 @@ ClassMethod GraphQL()
 	set sc = $$$OK
 	#dim %request as %CSP.Request
 	set query = %request.Content.query
-	set GiQLHASH = $system.Encryption.MD5Hash(query)
-	
-	if GiQLHASH = "ú60t·}RÌë"
+	set GiQLHASH = $system.Encryption.Base64Encode($system.Encryption.MD5Hash(query))
+	if GiQLHASH = "ABURmBQ3tap6wGcPz3hLSw=="
 	{	
-		w ##class(GraphQL.Utils.Schema).GetSchema().%ToJSON()
+		try{
+			w ##class(GraphQL.Utils.Schema).GetSchema().%ToJSON()
+		}catch ex{
+			set sc = ex.AsStatus()
+		}
 	}else{
 		try{
 			set parser = ##class(GraphQL.Parser).%New()
diff --git a/cls/GraphQL/Scope/All.cls b/cls/GraphQL/Scope/All.cls
@@ -10,6 +10,7 @@ ClassMethod GetClasses() As %List
 	{
 		set classname = rs.Name
 		continue:$e(classname)="%"
+		continue:$$$defClassKeyGet(classname,$$$cCLASSgeneratedby)'=""
 		continue:$$$defClassKeyGet(classname, $$$cCLASSsystem)'=0 // Skip system classes
 		continue:'$$$comClassDefined(classname) // TODO fix for mapped classes
 		set list = list _ $lb(classname)
@@ -18,6 +19,7 @@ ClassMethod GetClasses() As %List
 }
 
 /// This method should return a list of class fields, available for GraphQL 
+/// zw ##class(GraphQL.Scope.All).GetProperties()
 ClassMethod GetProperties(classname As %Dictionary.CacheClassname) As %List
 {
 	if ($$$classIsPersistent(classname) || $$$classIsSerial(classname))
@@ -26,8 +28,12 @@ ClassMethod GetProperties(classname As %Dictionary.CacheClassname) As %List
 		set class = ##class(%Dictionary.CompiledClass).%OpenId(classname)
 		for i=1:1:class.Properties.Count() 
 		{
+			
 			set property = class.Properties.GetAt(i)
+			set type = property.Type
 			if property.Internal || property.Calculated || property.ReadOnly || property.Private || property.Identity continue
+			continue:'($$$classIsPersistent(type) || $$$classIsSerial(type) || $$$classIsStream(type) || $$$classIsDataType(type))
+			continue:type="%Library.RegisteredObject"
 			set list = list _ $lb(property.Name)
 		}
 	}else{
diff --git a/cls/GraphQL/Scope/Package.cls b/cls/GraphQL/Scope/Package.cls
@@ -0,0 +1,53 @@
+Class GraphQL.Scope.Package Extends Abstract
+{
+
+Parameter Package = {"DeepSee"};
+
+/// This method should return a list of classes, available for GraphQL 
+ClassMethod GetClasses() As %List
+{
+	set list = ""
+	set rs = ..SubclassesListFunc()
+	while rs.%Next() 
+	{
+		set classname = rs.Name
+		continue:$e(classname)="%"
+		continue:$$$defClassKeyGet(classname,$$$cCLASSgeneratedby)'=""
+		continue:$$$defClassKeyGet(classname, $$$cCLASSsystem)'=0 // Skip system classes
+		continue:'$$$comClassDefined(classname) // TODO fix for mapped classes
+		set list = list _ $lb(classname)
+	}
+	quit list
+}
+
+/// This method should return a list of class fields, available for GraphQL 
+ClassMethod GetProperties(classname As %Dictionary.CacheClassname) As %List
+{
+	if ($$$classIsPersistent(classname))
+	{	
+		set list = ""
+		set class = ##class(%Dictionary.CompiledClass).%OpenId(classname)
+		for i=1:1:class.Properties.Count() 
+		{
+			set property = class.Properties.GetAt(i)
+			set type = property.Type
+			if property.Internal || property.Calculated || property.ReadOnly || property.Private || property.Identity continue
+			continue:'($$$classIsPersistent(type) || $$$classIsSerial(type) || $$$classIsStream(type) || $$$classIsDataType(type))
+			continue:type="%Library.RegisteredObject"
+			set list = list _ $lb(property.Name)
+		}
+	}else{
+		quit $$$ERROR($$$GeneralError,"Class: "_classname_" must by %Persystent")
+	}
+	quit list
+}
+
+Query SubclassesList(Package = {..#Package}) As %SQLQuery
+{
+SELECT  DISTINCT name
+FROM %Dictionary.ClassDefinitionQuery_SubclassOf('%Library.Persistent')
+where $piece(name,'.',1)= :Package
+}
+
+}
+
diff --git a/cls/GraphQL/Scope/Superclass.cls b/cls/GraphQL/Scope/Superclass.cls
@@ -12,6 +12,7 @@ ClassMethod GetClasses() As %List
 	{
 		set classname = rs.Name
 		continue:$e(classname)="%"
+		continue:$$$defClassKeyGet(classname,$$$cCLASSgeneratedby)'=""
 		continue:$$$defClassKeyGet(classname, $$$cCLASSsystem)'=0 // Skip system classes
 		continue:'$$$comClassDefined(classname) // TODO fix for mapped classes
 		set list = list _ $lb(classname)
@@ -24,12 +25,17 @@ ClassMethod GetProperties(classname As %Dictionary.CacheClassname) As %List
 {
 	if ($$$classIsPersistent(classname))
 	{
+		set list = ""
 		set class = ##class(%Dictionary.CompiledClass).%OpenId(classname)
 		for i=1:1:class.Properties.Count() 
 		{
+			
 			set property = class.Properties.GetAt(i)
+			set type = property.Type
 			if property.Internal || property.Calculated || property.ReadOnly || property.Private || property.Identity continue
-			set list = list _ $lb(property)
+			continue:'($$$classIsPersistent(type) || $$$classIsSerial(type) || $$$classIsStream(type) || $$$classIsDataType(type))
+			continue:type="%Library.RegisteredObject"
+			set list = list _ $lb(property.Name)
 		}
 	}else{
 		quit $$$ERROR($$$GeneralError,"Class: "_classname_" must by %Persystent")
diff --git a/cls/GraphQL/Utils/Schema.cls b/cls/GraphQL/Utils/Schema.cls
@@ -64,11 +64,13 @@ ClassMethod GetArgsOrFields(class As %Dictionary.CompiledClass, flag As %Boolean
 			do argsOrFields.%Push(..GetIDforFields())
 		}
 	}
+	set propList = $classmethod(##class(GraphQL.Settings).GetSetting("SCOPECLASS"), "GetProperties", class.Name)
 	for i=1:1:class.Properties.Count() 
 	{
 		set property = class.Properties.GetAt(i)
 		
 		if property.Internal || property.Calculated || property.ReadOnly || property.Private || property.Identity continue
+		continue:$lf(propList,property.Name)=0
 		
 		if ((flag = $$$Args) && (..GetKind(property.Type) = $$$SCALAR))
 		{
@@ -224,9 +226,13 @@ ClassMethod GetRootField(classname As %String) As %DynamicObject [ CodeMode = ex
 /// zw ##class(GraphQL.Utils.Schema).GetClassRelatedTypes("Sample.Employee")
 ClassMethod GetClassRelatedTypes(classname As %Dictionary.CacheClassname) As %List
 {
+	set relatedTypes = ""
+	set propList = $classmethod(##class(GraphQL.Settings).GetSetting("SCOPECLASS"), "GetProperties", classname)
 	&sql(SELECT 
 		%DLIST(Distinct Type) INTO :relatedTypes
-		FROM %Dictionary.CompiledProperty where parent = :classname)
+		FROM %Dictionary.CompiledProperty 
+		where parent = :classname and name %InList :propList
+		)
 	quit relatedTypes
 }
 
diff --git a/mac/ForBebug.MAC b/mac/ForBebug.MAC
@@ -1,3 +1,5 @@
 ROUTINE ForBebug
 	set parser = ##class(GraphQL.Parser).%New()
-	set ast = parser.Parse(##class(GraphQL.Source).%New("query { Sample_Person {Name Home {State} Id}} Sample_Employee {id}}"))
+	#dim ast As GraphQL.AST.ASTNode = parser.Parse(##class(GraphQL.Source).%New("{Sample_Company{id  Name}}"))
+	w ##class(GraphQL.Query.Executor).Execute(ast).%ToJSON()
+	

Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,7 @@ ClassMethod GetClasses() As %List`
`10`	`10`	`{`
`11`	`11`	`set classname = rs.Name`
`12`	`12`	`continue:$e(classname)="%"`
	`13`	`+ continue:$$$defClassKeyGet(classname,$$$cCLASSgeneratedby)'=""`
`13`	`14`	`continue:$$$defClassKeyGet(classname, $$$cCLASSsystem)'=0 // Skip system classes`
`14`	`15`	`continue:'$$$comClassDefined(classname) // TODO fix for mapped classes`
`15`	`16`	`set list = list _ $lb(classname)`
`@@ -18,6 +19,7 @@ ClassMethod GetClasses() As %List`
`18`	`19`	`}`
`19`	`20`
`20`	`21`	`/// This method should return a list of class fields, available for GraphQL`
	`22`	`+/// zw ##class(GraphQL.Scope.All).GetProperties()`
`21`	`23`	`ClassMethod GetProperties(classname As %Dictionary.CacheClassname) As %List`
`22`	`24`	`{`
`23`	`25`	`if ($$$classIsPersistent(classname) \|\| $$$classIsSerial(classname))`
`@@ -26,8 +28,12 @@ ClassMethod GetProperties(classname As %Dictionary.CacheClassname) As %List`
`26`	`28`	`set class = ##class(%Dictionary.CompiledClass).%OpenId(classname)`
`27`	`29`	`for i=1:1:class.Properties.Count()`
`28`	`30`	`{`
	`31`	`+`
`29`	`32`	`set property = class.Properties.GetAt(i)`
	`33`	`+ set type = property.Type`
`30`	`34`	`if property.Internal \|\| property.Calculated \|\| property.ReadOnly \|\| property.Private \|\| property.Identity continue`
	`35`	`+ continue:'($$$classIsPersistent(type) \|\| $$$classIsSerial(type) \|\| $$$classIsStream(type) \|\| $$$classIsDataType(type))`
	`36`	`+ continue:type="%Library.RegisteredObject"`
`31`	`37`	`set list = list _ $lb(property.Name)`
`32`	`38`	`}`
`33`	`39`	`}else{`
Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,7 @@ ClassMethod GetClasses() As %List`
`12`	`12`	`{`
`13`	`13`	`set classname = rs.Name`
`14`	`14`	`continue:$e(classname)="%"`
	`15`	`+ continue:$$$defClassKeyGet(classname,$$$cCLASSgeneratedby)'=""`
`15`	`16`	`continue:$$$defClassKeyGet(classname, $$$cCLASSsystem)'=0 // Skip system classes`
`16`	`17`	`continue:'$$$comClassDefined(classname) // TODO fix for mapped classes`
`17`	`18`	`set list = list _ $lb(classname)`
`@@ -24,12 +25,17 @@ ClassMethod GetProperties(classname As %Dictionary.CacheClassname) As %List`
`24`	`25`	`{`
`25`	`26`	`if ($$$classIsPersistent(classname))`
`26`	`27`	`{`
	`28`	`+ set list = ""`
`27`	`29`	`set class = ##class(%Dictionary.CompiledClass).%OpenId(classname)`
`28`	`30`	`for i=1:1:class.Properties.Count()`
`29`	`31`	`{`
	`32`	`+`
`30`	`33`	`set property = class.Properties.GetAt(i)`
	`34`	`+ set type = property.Type`
`31`	`35`	`if property.Internal \|\| property.Calculated \|\| property.ReadOnly \|\| property.Private \|\| property.Identity continue`
`32`		`- set list = list _ $lb(property)`
	`36`	`+ continue:'($$$classIsPersistent(type) \|\| $$$classIsSerial(type) \|\| $$$classIsStream(type) \|\| $$$classIsDataType(type))`
	`37`	`+ continue:type="%Library.RegisteredObject"`
	`38`	`+ set list = list _ $lb(property.Name)`
`33`	`39`	`}`
`34`	`40`	`}else{`
`35`	`41`	`quit $$$ERROR($$$GeneralError,"Class: "_classname_" must by %Persystent")`
Original file line number	Diff line number	Diff line change
`@@ -64,11 +64,13 @@ ClassMethod GetArgsOrFields(class As %Dictionary.CompiledClass, flag As %Boolean`
`64`	`64`	`do argsOrFields.%Push(..GetIDforFields())`
`65`	`65`	`}`
`66`	`66`	`}`
	`67`	`+ set propList = $classmethod(##class(GraphQL.Settings).GetSetting("SCOPECLASS"), "GetProperties", class.Name)`
`67`	`68`	`for i=1:1:class.Properties.Count()`
`68`	`69`	`{`
`69`	`70`	`set property = class.Properties.GetAt(i)`
`70`	`71`
`71`	`72`	`if property.Internal \|\| property.Calculated \|\| property.ReadOnly \|\| property.Private \|\| property.Identity continue`
	`73`	`+ continue:$lf(propList,property.Name)=0`
`72`	`74`
`73`	`75`	`if ((flag = $$$Args) && (..GetKind(property.Type) = $$$SCALAR))`
`74`	`76`	`{`
`@@ -224,9 +226,13 @@ ClassMethod GetRootField(classname As %String) As %DynamicObject [ CodeMode = ex`
`224`	`226`	`/// zw ##class(GraphQL.Utils.Schema).GetClassRelatedTypes("Sample.Employee")`
`225`	`227`	`ClassMethod GetClassRelatedTypes(classname As %Dictionary.CacheClassname) As %List`
`226`	`228`	`{`
	`229`	`+ set relatedTypes = ""`
	`230`	`+ set propList = $classmethod(##class(GraphQL.Settings).GetSetting("SCOPECLASS"), "GetProperties", classname)`
`227`	`231`	`&sql(SELECT`
`228`	`232`	`%DLIST(Distinct Type) INTO :relatedTypes`
`229`		`- FROM %Dictionary.CompiledProperty where parent = :classname)`
	`233`	`+ FROM %Dictionary.CompiledProperty`
	`234`	`+ where parent = :classname and name %InList :propList`
	`235`	`+ )`
`230`	`236`	`quit relatedTypes`
`231`	`237`	`}`
`232`	`238`