feat: allow @cascade trick + dgraph query bridge refactor

Author: dtrckd

db/gql.go

@@ -344,15 +344,16 @@ func (dg Dgraph) UpdateValue(uctx model.UserCtx, vertex string, id, k, v string)
 
 // GetDirectives return the list of directives to apply to the given query
 // by looking for the pressence of special attributes in the payload graph.
-func GetDirectives(pg string) string {
+func GetDirectives(pg string) (string, string) {
 	directives := []string{}
 	words := strings.Fields(pg)
 	for _, word := range words {
 		if word == "cascade_directive" {
 			directives = append(directives, "@cascade")
+			pg = strings.ReplaceAll(pg, "cascade_directive", "")
 		}
 	}
-	return strings.Join(directives, " ")
+	return pg, strings.Join(directives, " ")
 }
 
 // Query codec, to be used in the resolver functions
@@ -375,6 +376,8 @@ func (dg Dgraph) QueryExtra(uctx model.UserCtx, vertex string, filter any, order
 	}{filter, order, first, offset}
 	varmap, _ := MarshalWithoutNil(filter_)
 
+	qg, directives := GetDirectives(qg)
+
 	// Build the request template map
 	reqInput := map[string]string{
 		"QueryName":  queryName,               // Query name (e.g addUser)
@@ -383,7 +386,7 @@ func (dg Dgraph) QueryExtra(uctx model.UserCtx, vertex string, filter any, order
 		"QueryInput": QuoteString(queryInput), // inputs data
 		"QueryGraph": CleanString(qg, true),   // output data
 		"VarMap":     string(varmap),          // inputs data
-		"Directives": GetDirectives(qg),
+		"Directives": directives,
 	}
 
 	// Send request

graph/dgraph_resolver.go

@@ -93,22 +93,6 @@ func (r *mutationResolver) DgraphDeleteBridge(ctx context.Context, filter interf
 	return postGqlProcess(ctx, r.db, data, err)
 }
 
-/* Raw bridges pass the raw query from the request context to Dgraph.
- * @warning: It looses transformation that eventually happen in the resolvers/directives.
- * @warning: It is hard to modify the query with this approache
- * @deprecated
- */
-
-func (r *queryResolver) DgraphBridgeRaw(ctx context.Context, data interface{}) error {
-	err := DgraphQueryResolverRaw(ctx, r.db, data)
-	return postGqlProcess(ctx, r.db, data, err)
-}
-
-func (r *mutationResolver) DgraphBridgeRaw(ctx context.Context, data interface{}) error {
-	err := DgraphQueryResolverRaw(ctx, r.db, data)
-	return postGqlProcess(ctx, r.db, data, err)
-}
-
 func getUserQueryType(ctx context.Context) (*model.UserCtx, string, error) {
 	_, uctx, err := auth.GetUserContext(ctx)
 	if err != nil {
@@ -123,6 +107,9 @@ func getUserQueryType(ctx context.Context) (*model.UserCtx, string, error) {
 	return uctx, typeName, err
 }
 
+// postGqlProcess postprocess output data and error:
+// - ignore error if data are returned (cause by @auth rules filtering).
+// - handle meta query passed with redis.
 func postGqlProcess(ctx context.Context, db *db.Dgraph, data interface{}, errors error) error {
 	if data != nil && errors != nil {
 		// Gqlgen ignore the data if there is an error returned
@@ -170,6 +157,22 @@ func postGqlProcess(ctx context.Context, db *db.Dgraph, data interface{}, errors
 	return errors
 }
 
+/* Raw bridges pass the raw query from the request context to Dgraph.
+ * @warning: It looses transformation that eventually happen in the resolvers/directives.
+ * @warning: It is hard to modify the query with this approache
+ * @deprecated
+ */
+
+func (r *queryResolver) DgraphBridgeRaw(ctx context.Context, data interface{}) error {
+	err := DgraphQueryResolverRaw(ctx, r.db, data)
+	return postGqlProcess(ctx, r.db, data, err)
+}
+
+func (r *mutationResolver) DgraphBridgeRaw(ctx context.Context, data interface{}) error {
+	err := DgraphQueryResolverRaw(ctx, r.db, data)
+	return postGqlProcess(ctx, r.db, data, err)
+}
+
 // @deprecated: Follow the Gql request to Dgraph.
 // This use raw query from the request context and thus won't propagate change
 // of the input that may happend in the resolvers.