Updated date to datetime and allow automatic creation of said scalar

Author: epii-1

README.md

@@ -41,6 +41,7 @@ generation:
     # add id field to all schema types
     field_for_id: true
     # add creation date and last update date field(s) to all schema types
+    generate_datetime: false
     field_for_creation_date: true
     field_for_last_update_date: true
     # add reverse edges for traversal

graphql-api-generator/generator.py

@@ -49,6 +49,10 @@ def cmd(args):
 
 
 def run(schema: GraphQLSchema, config: dict):
+    # 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'):
+        datetime_control(schema)
+
     # validate
     if config.get('validate'):
         validate_names(schema, config.get('validate'))
@@ -140,6 +144,17 @@ def run(schema: GraphQLSchema, config: dict):
 
 
 def validate_names(schema: GraphQLSchema, validate):
+    # scalars
+    if validate.get('scalar_names'):
+        # type names
+        f = string_transforms.get(validate.get('scalar_names'))
+        if f is None:
+            raise Exception('Unrecognized option: ' + validate.get('type_names'))
+        for type_name, _type in schema.type_map.items():
+            if is_sclara_type(_type):
+                if f(type_name) != type_name:
+                    raise Exception(f'Scalar "{type_name}" does not follow {validate.get("scalar_names")}')
+
     # types and interfaces
     if validate.get('type_names'):
         # type names
@@ -181,6 +196,13 @@ def validate_names(schema: GraphQLSchema, validate):
 
 
 def transform_names(schema: GraphQLSchema, transform):
+    # scalar
+    if transform.get('scalar_names'):
+        if transform.get('scalar_names') in string_transforms:
+            transform_scalars(schema, string_transforms[transform.get('scalar_names')])
+        else:
+            raise Exception('Unsupported scalar name transform: ' + transform.get('scalar_names'))
+
     # types and interfaces
     if transform.get('type_names'):
         if transform.get('type_names') in string_transforms:
@@ -207,6 +229,16 @@ def transform_names(schema: GraphQLSchema, transform):
         drop_comments(schema)
 
 
+def transform_scalars(schema, transform):
+    type_names = set(schema.type_map.keys())
+    for type_name in type_names:
+        _type = schema.type_map[type_name]
+        if is_scalar_type(_type):
+            schema.type_map.pop(type_name)
+            _type.name = transform(type_name)
+            schema.type_map[_type.name] = _type
+
+
 def transform_types(schema, transform):
     type_names = set(schema.type_map.keys())
     for type_name in type_names:
@@ -256,6 +288,17 @@ def drop_comments(schema):
                 field.description = None
 
 
+def datetime_control(schema):
+    type_names = set(schema.type_map.keys())
+    if 'DateTime' in type_names:
+        if not is_scalar_type(schema.type_map['DateTime']):
+            raise Exception('DateTime exists but is not scalar type: ' + schema.type_map['DateTime'])
+    else:
+        schema.type_map['DateTime'] = GraphQLScalarType('DateTime')
+        if not is_scalar_type(schema.type_map['DateTime']):
+            raise Exception('DateTime could not be added as scalar!')
+
+
 if __name__ == '__main__':
     parser = argparse.ArgumentParser()
     parser.add_argument('--input', type=str, required=True,

graphql-api-generator/resources/config.yml

@@ -13,6 +13,7 @@ generation:
     # add id field to all schema types
     field_for_id: true
     # add creation date and last update date field(s) to all schema types
+    generate_datetime: false
     field_for_creation_date: false
     field_for_last_update_date: false
     # add reverse edges for traversal

graphql-api-generator/test/all_tests.py

@@ -50,3 +50,69 @@ def test_add_input_to_create_1(self):
         ''')
         schema_out = generator.run(schema_in, config)
         assert compare.is_equals_schema(schema_out, expected)
+
+    def test_add_crationDate_1(self):
+        schema_in = build_schema('''
+            type Test
+        ''')
+        config = {'generation': {'field_for_creation_date': True}}
+        expected = build_schema('''
+           scalar DateTime
+           type Test {
+               _creationDate: DateTime!
+           }
+        ''')
+        schema_out = run(schema_in, config)
+        assert compare.is_equals_schema(schema_out, expected)
+
+    def test_add_lastUpdateDate_1(self):
+        schema_in = build_schema('''
+           type Test
+        ''')
+        config = {'generation': {'field_for_last_update_date': True}}
+        expected = build_schema('''
+           scalar DateTime
+           type Test {
+               _lastUpdateDate: DateTime
+           }
+        ''')
+        schema_out = run(schema_in, config)
+        assert compare.is_equals_schema(schema_out, expected)
+
+    def test_datetime_scalar_1(self):
+        schema_in = build_schema('''
+            type datetime_test
+        ''')
+        config = {'generation': {'generate_datetime': True}}
+        try:
+            run(schema_in, config)
+            assert True
+        except:
+            assert False
+
+    def test_datetime_scalar_2(self):
+        schema_in = build_schema('''
+            scalar DateTime
+            type datetime_test { date: DateTime! }
+        ''')
+        config = {'generation': {'generate_datetime': True}}
+        try:
+            run(schema_in, config)
+            assert True
+        except:
+            assert False
+
+    def test_datetime_scalar_3(self):
+        schema_in = build_schema('''
+            type DateTime {
+                date: String!
+                time: String!
+            }
+            type datetime_test { date: DateTime! }
+        ''')
+        config = {'generation': {'generate_datetime': True}}
+        try:
+            run(schema_in, config)
+            assert False
+        except:
+            assert True

graphql-api-generator/utils/utils.py

@@ -109,9 +109,9 @@ def add_creation_date_to_types(schema: GraphQLSchema):
         if not is_schema_defined_type(_type):
             continue
         if is_interface_type(_type):
-            make += f'extend interface {_type.name} {{ _creationDate: Date! }} '
+            make += f'extend interface {_type.name} {{ _creationDate: DateTime! }} '
         else:
-            make += f'extend type {_type.name} {{ _creationDate: Date! }} '
+            make += f'extend type {_type.name} {{ _creationDate: DateTime! }} '
     return add_to_schema(schema, make)
 
 
@@ -126,9 +126,9 @@ def add_last_update_date_to_types(schema: GraphQLSchema):
         if not is_schema_defined_type(_type):
             continue
         if is_interface_type(_type):
-            make += f'extend interface {_type.name} {{ _lastUpdateDate: Date }} '
+            make += f'extend interface {_type.name} {{ _lastUpdateDate: DateTime }} '
         else:
-            make += f'extend type {_type.name} {{ _lastUpdateDate: Date }} '
+            make += f'extend type {_type.name} {{ _lastUpdateDate: DateTime }} '
     return add_to_schema(schema, make)