graphql with 2 arguments

ignatandrei · ignatandrei · commit 88d47d16d9a6 · 2020-06-15T07:59:44.000+03:00
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -10,7 +10,7 @@ variables:
   solution: '**/*.sln'
   buildPlatform: 'Any CPU'
   buildConfiguration: 'Release'
-  deployNuget: '0'
+  deployNuget: '1'
 
 steps:
 - task: NuGetToolInstaller@1
diff --git a/src/NetCore2Blockly/NetCore2Blockly/ExtensionMethods/ActionInfoExtensions.cs b/src/NetCore2Blockly/NetCore2Blockly/ExtensionMethods/ActionInfoExtensions.cs
@@ -67,6 +67,8 @@ public static string GenerateCommandName(this ActionInfo actionInfo)
                 .Replace(@"\", "_")
                 .Replace(@"?", "_")
                 .Replace(@"=", "_")
+                .Replace("\"", "_")
+                .Replace(":", "_")
                 ;
             return $"{nameCommand}_{actionInfo.Verb}";
 
diff --git a/src/NetCore2Blockly/NetCore2Blockly/GraphQL/GraphQLActionInfo.cs b/src/NetCore2Blockly/NetCore2Blockly/GraphQL/GraphQLActionInfo.cs
@@ -48,13 +48,20 @@ internal void Init()
                     Params.Add(arg.Name, (typeInGraph, BindingSourceDefinition.Query));
                 }
                 argsInQuery = string.Join(",",
-                    Params.Select(it=>it.Key +":{" +it.Key+"}")
+                    f.Args
+                    .Select(it=>new { it.Name, isString=(it.Type.Name == "String") })
+                    .Select(it=>it.Name +":"
+                    + (it.isString ? "\"" : "")
+                    + "{" +it.Name +"}"
+                    + (it.isString ? "\"" : "")
+                    )
 
                     );
                 argsInQuery = $"({argsInQuery})";
             }
 
             RelativeRequestUrl = "/graphql?query={" + f.Name + argsInQuery+ "{"+ ret +"}}";
+            this.
             Verb = "GET";
             ReturnType = BlocklyType.CreateValue(null);
 
diff --git a/src/NetCore2Blockly/TestBlocklyHtml/GraphQL/DepartmentRepository.cs b/src/NetCore2Blockly/TestBlocklyHtml/GraphQL/DepartmentRepository.cs
@@ -1,4 +1,7 @@
-﻿using System.Collections.Generic;
+﻿
+using Microsoft.EntityFrameworkCore;
+using System;
+using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 using TestBlocklyHtml.DB;
@@ -17,18 +20,32 @@ public DepartmentRepository(testsContext context)
         public async Task<IEnumerable<Department>> GetDepartment()
         {
 
-            var items= await _context.Department.ToArrayAsync();
+            var items= await _context.Department.AsQueryable().ToArrayAsync();
             return items;
         }
 
         public async Task<Department> GetOneDepartment(int id)
         {
-            return await _context.Department.FirstOrDefaultAsync(dep => dep.Iddepartment == id);
+            return await _context.Department.AsQueryable().FirstOrDefaultAsync(dep => dep.Iddepartment == id);
         }
 
         public async Task<IEnumerable<Employee>> GetEmployees()
         {
-            return await _context.Employee.ToListAsync();
+            return await _context.Employee.AsQueryable().ToListAsync();
+        }
+
+        internal Task<Employee[]> GetEmployeesAfterName(string empName, string depName)
+        {
+            var data = _context.Employee.AsQueryable();
+            if(!string.IsNullOrWhiteSpace(empName))
+            {
+                data = data.Where(it => it.Name.Contains(empName));
+            }
+            if (!string.IsNullOrWhiteSpace(depName))
+            {
+                data = data.Where(it => it.Name.Contains(depName));
+            }
+            return data.AsQueryable().ToArrayAsync();
         }
     }
 }
diff --git a/src/NetCore2Blockly/TestBlocklyHtml/GraphQL/GetAllQuery.cs b/src/NetCore2Blockly/TestBlocklyHtml/GraphQL/GetAllQuery.cs
@@ -27,6 +27,22 @@ public GetAllQuery(DepartmentRepository departmentRepository)
                         return departmentRepository.GetOneDepartment(id);
                     }
                     );
+
+                FieldAsync< ListGraphType<EmployeeOGT>>(
+                    "getEmployeeAfterName",
+                    arguments: new QueryArguments(
+                        new QueryArgument<StringGraphType> { Name = "employeeName" },
+                        new QueryArgument<StringGraphType> { Name = "departmentName" }
+
+                        ),
+                    resolve:async  context =>
+                    {
+                        var empName = context.GetArgument<string>("employeeName");
+                        var depName = context.GetArgument<string>("departmentName");
+                        return await departmentRepository.GetEmployeesAfterName(empName,depName);
+                    }
+                    );
+
             }
         }
     }
diff --git a/src/NetCore2Blockly/TestBlocklyHtml/wwwroot/doNotCopy/testing.js b/src/NetCore2Blockly/TestBlocklyHtml/wwwroot/doNotCopy/testing.js
@@ -2171,7 +2171,7 @@ var testBlocks = [
     <next>
       <block type="text_print">
         <value name="TEXT">
-          <block type="_graphql_query__getOneDepartment_id:_id___iddepartment name___id_GET">
+          <block type="_graphql_query__getOneDepartment_id__id___iddepartment name___id_GET">
             <value name="val_id">
               <shadow type="math_number">
                 <field name="NUM">1</field>
@@ -2182,6 +2182,27 @@ var testBlocks = [
       </block>
     </next>
   </block>
+</xml>`
+    },
+    {
+        name: 'graphql 2 arg string',
+        data:`<xml xmlns="https://developers.google.com/blockly/xml">
+  <block type="text_print" x="95" y="213">
+    <value name="TEXT">
+      <block type="_graphql_query__getEmployeeAfterName_employeeName___employeeName__,departmentName___departmentName____idemployee name___employeeName_departmentName_GET">
+        <value name="val_employeeName">
+          <shadow type="text">
+            <field name="TEXT">erson</field>
+          </shadow>
+        </value>
+        <value name="val_departmentName">
+          <shadow type="text">
+            <field name="TEXT">IT</field>
+          </shadow>
+        </value>
+      </block>
+    </value>
+  </block>
 </xml>`
     }
 ]

Original file line number	Diff line number	Diff line change
`@@ -67,6 +67,8 @@ public static string GenerateCommandName(this ActionInfo actionInfo)`
`67`	`67`	`.Replace(@"\", "_")`
`68`	`68`	`.Replace(@"?", "_")`
`69`	`69`	`.Replace(@"=", "_")`
	`70`	`+ .Replace("\"", "_")`
	`71`	`+ .Replace(":", "_")`
`70`	`72`	`;`
`71`	`73`	`return $"{nameCommand}_{actionInfo.Verb}";`
`72`	`74`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,7 @@`
`1`		`-using System.Collections.Generic;`
	`1`	`+`
	`2`	`+using Microsoft.EntityFrameworkCore;`
	`3`	`+using System;`
	`4`	`+using System.Collections.Generic;`
`2`	`5`	`using System.Linq;`
`3`	`6`	`using System.Threading.Tasks;`
`4`	`7`	`using TestBlocklyHtml.DB;`
`@@ -17,18 +20,32 @@ public DepartmentRepository(testsContext context)`
`17`	`20`	`public async Task<IEnumerable<Department>> GetDepartment()`
`18`	`21`	`{`
`19`	`22`
`20`		`- var items= await _context.Department.ToArrayAsync();`
	`23`	`+ var items= await _context.Department.AsQueryable().ToArrayAsync();`
`21`	`24`	`return items;`
`22`	`25`	`}`
`23`	`26`
`24`	`27`	`public async Task<Department> GetOneDepartment(int id)`
`25`	`28`	`{`
`26`		`- return await _context.Department.FirstOrDefaultAsync(dep => dep.Iddepartment == id);`
	`29`	`+ return await _context.Department.AsQueryable().FirstOrDefaultAsync(dep => dep.Iddepartment == id);`
`27`	`30`	`}`
`28`	`31`
`29`	`32`	`public async Task<IEnumerable<Employee>> GetEmployees()`
`30`	`33`	`{`
`31`		`- return await _context.Employee.ToListAsync();`
	`34`	`+ return await _context.Employee.AsQueryable().ToListAsync();`
	`35`	`+ }`
	`36`	`+`
	`37`	`+ internal Task<Employee[]> GetEmployeesAfterName(string empName, string depName)`
	`38`	`+ {`
	`39`	`+ var data = _context.Employee.AsQueryable();`
	`40`	`+ if(!string.IsNullOrWhiteSpace(empName))`
	`41`	`+ {`
	`42`	`+ data = data.Where(it => it.Name.Contains(empName));`
	`43`	`+ }`
	`44`	`+ if (!string.IsNullOrWhiteSpace(depName))`
	`45`	`+ {`
	`46`	`+ data = data.Where(it => it.Name.Contains(depName));`
	`47`	`+ }`
	`48`	`+ return data.AsQueryable().ToArrayAsync();`
`32`	`49`	`}`
`33`	`50`	`}`
`34`	`51`	`}`
Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,22 @@ public GetAllQuery(DepartmentRepository departmentRepository)`
`27`	`27`	`return departmentRepository.GetOneDepartment(id);`
`28`	`28`	`}`
`29`	`29`	`);`
	`30`	`+`
	`31`	`+ FieldAsync< ListGraphType<EmployeeOGT>>(`
	`32`	`+ "getEmployeeAfterName",`
	`33`	`+ arguments: new QueryArguments(`
	`34`	`+ new QueryArgument<StringGraphType> { Name = "employeeName" },`
	`35`	`+ new QueryArgument<StringGraphType> { Name = "departmentName" }`
	`36`	`+`
	`37`	`+ ),`
	`38`	`+ resolve:async context =>`
	`39`	`+ {`
	`40`	`+ var empName = context.GetArgument<string>("employeeName");`
	`41`	`+ var depName = context.GetArgument<string>("departmentName");`
	`42`	`+ return await departmentRepository.GetEmployeesAfterName(empName,depName);`
	`43`	`+ }`
	`44`	`+ );`
	`45`	`+`
`30`	`46`	`}`
`31`	`47`	`}`
`32`	`48`	`}`