Added filters and filtering conditions for Date and DateTime

Author: epii-1

graphql-api-generator/generator.py

@@ -49,8 +49,15 @@ def cmd(args):
 
 
 def run(schema: GraphQLSchema, config: dict):
+    #Avoid some weird config combinations
+    config.get('generation')['generate_datetime'] = config.get('generation').get('generate_datetime') or config.get('generation').get('field_for_creation_date') or config.get('generation').get('field_for_last_update_date')
+
+    # check if Date exists, or should be added
+    # If it already exists (in the excpected way, we handle it as if we added it
+    config.get('generation')['generate_date'] = date_control(schema, config.get('generation').get('generate_date'))
+
     # check if DateTime exists, or should be added
-    if config.get('generation').get('generate_datetime') or config.get('generation').get('field_for_creation_date') or config.get('generation').get('field_for_last_update_date'):
+    if config.get('generation').get('generate_datetime'):
         datetime_control(schema)
 
     # validate
@@ -95,8 +102,8 @@ def run(schema: GraphQLSchema, config: dict):
             schema = add_get_queries(schema)
         if config.get('generation').get('query_type_filter') or config.get('generation').get('query_list_of'):
             schema = add_enum_filters(schema)
-            schema = add_scalar_filters(schema)
-            schema = add_type_filters(schema)
+            schema = add_scalar_filters(schema, config)
+            schema = add_type_filters(schema, config.get('generation').get('field_for_creation_date'), config.get('generation').get('field_for_last_update_date'))
 
         if config.get('generation').get('query_type_filter'):
             schema = add_object_type_filters(schema)
@@ -273,6 +280,21 @@ def datetime_control(schema):
             raise Exception('DateTime could not be added as scalar!')
 
 
+def date_control(schema, config: dict):
+    type_names = set(schema.type_map.keys())
+    if 'Date' in type_names:
+        if not is_scalar_type(schema.type_map['Date']):
+            raise Exception('Date exists but is not scalar type: ' + schema.type_map['Date'])
+        return True
+    elif config.get('generation').get('generate_date'):
+        schema.type_map['Date'] = GraphQLScalarType('Date')
+        if not is_scalar_type(schema.type_map['Date']):
+            raise Exception('Date could not be added as scalar!')
+        return True
+    return False
+
+
+
 if __name__ == '__main__':
     parser = argparse.ArgumentParser()
     parser.add_argument('--input', type=str, required=True,

graphql-api-generator/resources/config.yml

@@ -12,6 +12,8 @@ generation:
     add_mutation_type: true
     # add id field to all schema types
     field_for_id: true
+    # add the Data scalar
+    generate_date: false
     # add creation date and last update date field(s) to all schema types
     generate_datetime: false
     field_for_creation_date: false

graphql-api-generator/utils/utils.py

@@ -412,13 +412,15 @@ def add_list_queries(schema: GraphQLSchema):
     return schema
 
 
-def add_scalar_filters(schema: GraphQLSchema):
+def add_scalar_filters(schema: GraphQLSchema, config: dict):
     """
     Add filter inputs for GrahpQL types (Hasura-style).
     :param schema:
     :return:
     """
     make = ''
+    manually_handled_scalars = ['Int', 'Float', 'String', 'Boolean', 'ID']
+
     # Numeric
     scalars = ['Int', 'Float']
     for scalar in scalars:
@@ -471,9 +473,37 @@ def add_scalar_filters(schema: GraphQLSchema):
             '   _neq: Boolean ' \
             '} '
 
+    # Date
+    if config.get('generation').get('generate_date'):
+        manually_handled_scalars.append('Date')
+        make += 'input _DateFilter {' \
+                '   _eq: Date ' \
+                '   _neq: Date ' \
+                '   _in: [Date] ' \
+                '   _nin: [Date] ' \
+                '   _gt: Date ' \
+                '   _egt: Date ' \
+                '   _lt: Date ' \
+                '   _elt: Date ' \
+                '} '
+
+    # DateTime
+    if config.get('generation').get('generate_datetime'):
+        manually_handled_scalars.append('DateTime')
+        make += 'input _DateTimeFilter {' \
+                '   _eq: DateTime ' \
+                '   _neq: DateTime ' \
+                '   _in: [DateTime] ' \
+                '   _nin: [DateTime] ' \
+                '   _gt: DateTime ' \
+                '   _egt: DateTime ' \
+                '   _lt: DateTime ' \
+                '   _elt: DateTime ' \
+                '} '
+
     # Schema-defined scalars
     for scalar_name, scalar in schema.type_map.items():
-        if not is_scalar_type(scalar) or scalar_name in ['Int', 'Float', 'String', 'Boolean', 'ID']:
+        if not is_scalar_type(scalar) or scalar_name in manually_handled_scalars:
             continue
 
         make += f'input _{scalar_name}Filter {{' \
@@ -488,7 +518,7 @@ def add_scalar_filters(schema: GraphQLSchema):
     return schema
 
 
-def add_type_filters(schema: GraphQLSchema):
+def add_type_filters(schema: GraphQLSchema, field_for_creation_date, field_for_last_update_date):
     """
     Add filter types (Hasura-style filters).
     :param schema: schema
@@ -505,7 +535,7 @@ def add_type_filters(schema: GraphQLSchema):
             f'   _not: _FilterFor{_type.name} '
 
         for field_name, field in _type.fields.items():
-            if field_name[0] == '_':
+            if field_name[0] == '_' and not (field_for_creation_date and field_name == '_creationDate') and not (field_for_last_update_date and field_name == '_lastUpdateDate'):
                 continue
 
             # remove outer required
@@ -565,9 +595,9 @@ def add_edge_objects(schema: GraphQLSchema, field_for_creation_date, field_for_l
     creation_date_string = ''
     last_update_date_string = ''
     if field_for_creation_date:
-        creation_date_string = '_creationDate: Date!'
+        creation_date_string = '_creationDate: DateTime!'
     if field_for_last_update_date:
-        last_update_date_string = '_lastUpdateDate: Date'
+        last_update_date_string = '_lastUpdateDate: DateTime'
     for _type in schema.type_map.values():
         if not is_schema_defined_type(_type) or is_interface_type(_type):
             continue