Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion configurator/services/dictionary_services.py
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ def __init__(self, name: str, property: dict):
self.enums = property.get("enums", None)
self.additional_properties = property.get("additional_properties", False)
self.properties = {}
self.items = {}}
self.items = {}

# Initialize properties if this is an object type
if self.type == "object":
Expand Down
2 changes: 1 addition & 1 deletion tests/services/test_dictionary_service_operations.py
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ def test_init_with_missing_values(self):
self.assertFalse(prop.required)
self.assertFalse(prop.additional_properties)
self.assertEqual(prop.properties, {})
self.assertIsNone(prop.items)
self.assertEqual(prop.items, {})

def test_to_dict_with_ref(self):
"""Test to_dict method for ref property"""
Expand Down
2 changes: 2 additions & 0 deletions tests/test_cases/playground/configurations/sample.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ versions:
unique: false
migrations: []
test_data: sample.1.0.0.1.json
_locked: false
- version: 1.0.1.2
drop_indexes:
- name: nameIndex
Expand All @@ -30,4 +31,5 @@ versions:
migrations:
- first_last_to_full_name.json
test_data: sample.1.0.1.2.json
_locked: false
_locked: true
2 changes: 1 addition & 1 deletion tests/test_cases/playground/dictionaries/sample.1.0.0.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ root:
description: A simple collection for testing
type: object
required: false
additional_properties: false
properties:
_id:
description: The unique identifier for the media
Expand All @@ -22,4 +23,3 @@ root:
type: enum
required: true
enums: default_status
additionalProperties: false
2 changes: 1 addition & 1 deletion tests/test_cases/playground/dictionaries/sample.1.0.1.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ root:
description: A simple collection for testing
type: object
required: false
additional_properties: false
properties:
_id:
description: The unique identifier for the media
Expand All @@ -18,4 +19,3 @@ root:
type: enum
required: true
enums: default_status
additionalProperties: false
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
version: 0
enumerators: {}
_locked: false
file_name: enumerations.0.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,4 @@ enumerators:
test_enum:
foo: bar
_locked: false
file_name: enumerations.1.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
version: 2
enumerators: {}
_locked: false
file_name: enumerations.2.yaml
11 changes: 5 additions & 6 deletions tests/test_cases/playground/types/appointment.yaml
Original file line number Diff line number Diff line change
@@ -1,16 +1,15 @@
file_name: appointment.yaml
_locked: true
root:
file_name: appointment.yaml
_locked: true
description: A date/time range
required: false
type: object
properties:
from:
description: Starting Date/Time
required: true
type: date-time
required: true
to:
description: Ending Date/Time
required: true
type: date-time
additionalProperties: false
required: true
required: false
15 changes: 7 additions & 8 deletions tests/test_cases/playground/types/breadcrumb.yaml
Original file line number Diff line number Diff line change
@@ -1,24 +1,23 @@
file_name: breadcrumb.yaml
_locked: true
root:
file_name: breadcrumb.yaml
_locked: true
description: A tracking breadcrumb
required: false
type: object
properties:
from_ip:
description: Http Request remote IP address
required: true
type: ip_address
required: true
by_user:
description: ID Of User
required: true
type: word
required: true
at_time:
description: The date-time when last updated
required: true
type: date-time
required: true
correlation_id:
description: The logging correlation ID of the update transaction
required: true
type: word
additionalProperties: false
required: true
required: false
6 changes: 3 additions & 3 deletions tests/test_cases/playground/types/count.yaml
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
file_name: count.yaml
_locked: true
root:
file_name: count.yaml
_locked: true
description: A positive integer value
required: false
json_type:
type: number
minimum: 1
multipleOf: 1
bson_type:
bsonType: int
minimum: 1
required: false
6 changes: 3 additions & 3 deletions tests/test_cases/playground/types/date-time.yaml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
file_name: date-time.yaml
_locked: true
root:
file_name: date-time.yaml
_locked: true
description: An ISO 8601 formatted date-time string
required: false
json_type:
type: string
format: date-time
bson_type:
bsonType: date
required: false
6 changes: 3 additions & 3 deletions tests/test_cases/playground/types/email.yaml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
file_name: email.yaml
_locked: true
root:
file_name: email.yaml
_locked: true
description: A valid email address
required: false
schema:
type: string
pattern: ^[^\s@]+@[^\s@]+\.[^\s@]+$
required: false
6 changes: 3 additions & 3 deletions tests/test_cases/playground/types/identifier.yaml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
file_name: identifier.yaml
_locked: true
root:
file_name: identifier.yaml
_locked: true
description: A unique identifier for a document
required: false
json_type:
type: string
pattern: ^[0-9a-fA-F]{24}$
bson_type:
bsonType: objectId
required: false
6 changes: 3 additions & 3 deletions tests/test_cases/playground/types/identity.yaml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
file_name: identity.yaml
_locked: true
root:
file_name: identity.yaml
_locked: true
description: A unique identifier for a document
required: false
json_type:
type: string
pattern: ^[0-9a-fA-F]{24}$
bson_type:
bsonType: objectId
required: false
6 changes: 3 additions & 3 deletions tests/test_cases/playground/types/index.yaml
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
file_name: index.yaml
_locked: true
root:
file_name: index.yaml
_locked: true
description: A zero-based array index
required: false
json_type:
type: number
minimum: 0
multipleOf: 1
bson_type:
bsonType: int
minimum: 0
required: false
6 changes: 3 additions & 3 deletions tests/test_cases/playground/types/ip_address.yaml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
file_name: ip_address.yaml
_locked: true
root:
file_name: ip_address.yaml
_locked: true
description: A valid IP Address
required: false
schema:
type: string
pattern: ^((25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$
required: false
6 changes: 3 additions & 3 deletions tests/test_cases/playground/types/markdown.yaml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
file_name: markdown.yaml
_locked: true
root:
file_name: markdown.yaml
_locked: true
description: A String of text, at least 1 and no more than 4k characters. May contain
markdown, newlines, and tabs.
required: false
schema:
type: string
maxLength: 4096
required: false
6 changes: 3 additions & 3 deletions tests/test_cases/playground/types/sentence.yaml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
file_name: sentence.yaml
_locked: true
root:
file_name: sentence.yaml
_locked: true
description: A String of text, 0 to 255 characters with no special characters
required: false
schema:
type: string
pattern: ^[^\t\n\r]{0,255}$
required: false
6 changes: 3 additions & 3 deletions tests/test_cases/playground/types/state_code.yaml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
file_name: state_code.yaml
_locked: true
root:
file_name: state_code.yaml
_locked: true
description: A two character state code
required: false
schema:
type: string
pattern: ^[A-Z]{2}$
required: false
15 changes: 7 additions & 8 deletions tests/test_cases/playground/types/street_address.yaml
Original file line number Diff line number Diff line change
@@ -1,24 +1,23 @@
file_name: street_address.yaml
_locked: true
root:
file_name: street_address.yaml
_locked: true
description: A street address
required: false
type: object
properties:
street:
description: Street address
required: true
type: sentence
required: true
city:
description: City
required: false
type: word
required: false
state:
description: State or province
required: false
type: state_code
required: false
postal_code:
description: Postal code
required: true
type: word
additionalProperties: false
required: true
required: false
6 changes: 6 additions & 0 deletions tests/test_cases/playground/types/test_type.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
file_name: test_type.yaml
_locked: true
root:
description: Updated test type for stepCI testing
type: string
required: true
6 changes: 3 additions & 3 deletions tests/test_cases/playground/types/url.yaml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
file_name: url.yaml
_locked: true
root:
file_name: url.yaml
_locked: true
description: A valid URL
required: false
schema:
type: string
pattern: ^https?://[^\s]+$
required: false
6 changes: 3 additions & 3 deletions tests/test_cases/playground/types/us_phone.yaml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
file_name: us_phone.yaml
_locked: true
root:
file_name: us_phone.yaml
_locked: true
description: A US phone number in E.164 format
required: false
schema:
type: string
pattern: ^\+1[2-9][0-9]{9}$
required: false
6 changes: 3 additions & 3 deletions tests/test_cases/playground/types/word.yaml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
file_name: word.yaml
_locked: true
root:
file_name: word.yaml
_locked: true
description: A String of text, 1 to 40 characters with no spaces, or special characters
like /t or /n
required: false
schema:
type: string
pattern: ^\S{1,40}$
required: false
Loading