Skip to content
GitLab
Commit ac8b6d99 authored by fabian serin's avatar fabian serin
Browse files

Merge branch 'fserin/welllog100_update' into 'master' 

WellLog 100 schema update and forbid extra fields

See merge request !140
parents c03bf98b da80a5b7
Pipeline #48506 failed with stages
in 10 minutes and 49 seconds
Expand all Hide whitespace changes
Inline Side-by-side
app/model/osdu_model.py
View file @ ac8b6d99
This diff is collapsed.
app/routers/search/fast_search_v3.py
View file @ ac8b6d99
......@@ -20,7 +20,7 @@ from .search_v3 import (
SearchQuery,
query_type,
basic_query_request,
added_query,
added_relationships_query,
query_request_with_specific_attribute,
OSDU_WELLBORE_KIND,
OSDU_WELLLOG_KIND,
......@@ -52,7 +52,7 @@ async def fastquery_wellbores(body: SearchQuery = None, ctx: Context = Depends(g
response_model=CursorQueryResponse)
async def fastquery_welllogs_bywellbore(wellbore_id: str, body: SearchQuery = None,
ctx: Context = Depends(get_ctx)):
query = added_query(wellbore_id, WELLBORE_RELATIONSHIP, body.query)
query = added_relationships_query(wellbore_id, WELLBORE_RELATIONSHIP, body.query)
return await basic_query_request(query_type, OSDU_WELLLOG_KIND, ctx, query)
......@@ -77,5 +77,5 @@ async def fastquery_welllogs_bywellboreattribute(wellbore_attribute: str, body:
response_model=CursorQueryResponse)
async def fastquery_markers_bywellbore(wellbore_id: str, body: SearchQuery = None,
ctx: Context = Depends(get_ctx)):
query = added_query(wellbore_id, WELLBORE_RELATIONSHIP, body.query)
query = added_relationships_query(wellbore_id, WELLBORE_RELATIONSHIP, body.query)
return await basic_query_request(query_type, OSDU_WELLBOREMARKERSET_KIND, ctx, query)
spec/generated/openapi.json
View file @ ac8b6d99
This diff is collapsed.
tests/integration/functional/request_builders/wdms/crud/osdu_welllog.py
View file @ ac8b6d99
......@@ -361,6 +361,19 @@ def build_request_create_osdu_welllog(b_use_fixed_id=True) -> RequestRunner:
"DrillingFluidProperty": "Example DrillingFluidProperty",
"HoleTypeLogging": "OPENHOLE",
"VerticalMeasurementID": "Example VerticalMeasurementID",
"VerticalMeasurement": {
"EffectiveDateTime": "2020-02-13T09:13:15.550000+00:00",
"VerticalMeasurement": 12345.6,
"TerminationDateTime": "2020-02-13T09:13:15.550000+00:00",
"VerticalMeasurementTypeID": "namespace:reference-data--VerticalMeasurementType:Plug%20Back%20depth:",
"VerticalMeasurementPathID": "namespace:reference-data--VerticalMeasurementPath:SomeUniqueVerticalMeasurementPathID:",
"VerticalMeasurementSourceID": "namespace:reference-data--VerticalMeasurementSource:SomeUniqueVerticalMeasurementSourceID:",
"WellboreTVDTrajectoryID": "namespace:work-product-component--WellboreTrajectory:WellboreTrajectory-911bb71f-06ab-4deb-8e68-b8c9229dc76b:",
"VerticalMeasurementUnitOfMeasureID": "namespace:reference-data--UnitOfMeasure:m:",
"VerticalCRSID": "namespace:reference-data--CoordinateReferenceSystem:SomeUniqueCoordinateReferenceSystemID:",
"VerticalReferenceID": "Example VerticalReferenceID",
"VerticalMeasurementDescription": "Example VerticalMeasurementDescription"
},
"Curves": [
{
"CurveID": "Example CurveID",
......@@ -380,20 +393,7 @@ def build_request_create_osdu_welllog(b_use_fixed_id=True) -> RequestRunner:
"LogCurveTypeID": "namespace:reference-data--LogCurveType:SomeUniqueLogCurveTypeID:",
"LogCurveBusinessValueID": "namespace:reference-data--LogCurveBusinessValue:SomeUniqueLogCurveBusinessValueID:",
"LogCurveMainFamilyID": "namespace:reference-data--LogCurveMainFamily:SomeUniqueLogCurveMainFamilyID:",
"LogCurveFamilyID": "namespace:reference-data--LogCurveFamily:SomeUniqueLogCurveFamilyID:",
"VerticalMeasurement": {
"EffectiveDateTime": "2020-02-13T09:13:15.550000+00:00",
"VerticalMeasurement": 12345.6,
"TerminationDateTime": "2020-02-13T09:13:15.550000+00:00",
"VerticalMeasurementTypeID": "namespace:reference-data--VerticalMeasurementType:Plug%20Back%20depth:",
"VerticalMeasurementPathID": "namespace:reference-data--VerticalMeasurementPath:SomeUniqueVerticalMeasurementPathID:",
"VerticalMeasurementSourceID": "namespace:reference-data--VerticalMeasurementSource:SomeUniqueVerticalMeasurementSourceID:",
"WellboreTVDTrajectoryID": "namespace:work-product-component--WellboreTrajectory:WellboreTrajectory-911bb71f-06ab-4deb-8e68-b8c9229dc76b:",
"VerticalMeasurementUnitOfMeasureID": "namespace:reference-data--UnitOfMeasure:m:",
"VerticalCRSID": "namespace:reference-data--CoordinateReferenceSystem:SomeUniqueCoordinateReferenceSystemID:",
"VerticalReferenceID": "Example VerticalReferenceID",
"VerticalMeasurementDescription": "Example VerticalMeasurementDescription"
}
"LogCurveFamilyID": "namespace:reference-data--LogCurveFamily:SomeUniqueLogCurveFamilyID:"
}
],
"ExtensionProperties": {}
......@@ -689,6 +689,19 @@ def get_cleaned_ref_and_res(res: dict) -> (dict, dict):
"DrillingFluidProperty": "Example DrillingFluidProperty",
"HoleTypeLogging": "OPENHOLE",
"VerticalMeasurementID": "Example VerticalMeasurementID",
"VerticalMeasurement": {
"EffectiveDateTime": "2020-02-13T09:13:15.550000+00:00",
"VerticalMeasurement": 12345.6,
"TerminationDateTime": "2020-02-13T09:13:15.550000+00:00",
"VerticalMeasurementTypeID": "namespace:reference-data--VerticalMeasurementType:Plug%20Back%20depth:",
"VerticalMeasurementPathID": "namespace:reference-data--VerticalMeasurementPath:SomeUniqueVerticalMeasurementPathID:",
"VerticalMeasurementSourceID": "namespace:reference-data--VerticalMeasurementSource:SomeUniqueVerticalMeasurementSourceID:",
"WellboreTVDTrajectoryID": "namespace:work-product-component--WellboreTrajectory:WellboreTrajectory-911bb71f-06ab-4deb-8e68-b8c9229dc76b:",
"VerticalMeasurementUnitOfMeasureID": "namespace:reference-data--UnitOfMeasure:m:",
"VerticalCRSID": "namespace:reference-data--CoordinateReferenceSystem:SomeUniqueCoordinateReferenceSystemID:",
"VerticalReferenceID": "Example VerticalReferenceID",
"VerticalMeasurementDescription": "Example VerticalMeasurementDescription"
},
"Curves": [
{
"CurveID": "Example CurveID",
......@@ -708,20 +721,7 @@ def get_cleaned_ref_and_res(res: dict) -> (dict, dict):
"LogCurveTypeID": "namespace:reference-data--LogCurveType:SomeUniqueLogCurveTypeID:",
"LogCurveBusinessValueID": "namespace:reference-data--LogCurveBusinessValue:SomeUniqueLogCurveBusinessValueID:",
"LogCurveMainFamilyID": "namespace:reference-data--LogCurveMainFamily:SomeUniqueLogCurveMainFamilyID:",
"LogCurveFamilyID": "namespace:reference-data--LogCurveFamily:SomeUniqueLogCurveFamilyID:",
"VerticalMeasurement": {
"EffectiveDateTime": "2020-02-13T09:13:15.550000+00:00",
"VerticalMeasurement": 12345.6,
"TerminationDateTime": "2020-02-13T09:13:15.550000+00:00",
"VerticalMeasurementTypeID": "namespace:reference-data--VerticalMeasurementType:Plug%20Back%20depth:",
"VerticalMeasurementPathID": "namespace:reference-data--VerticalMeasurementPath:SomeUniqueVerticalMeasurementPathID:",
"VerticalMeasurementSourceID": "namespace:reference-data--VerticalMeasurementSource:SomeUniqueVerticalMeasurementSourceID:",
"WellboreTVDTrajectoryID": "namespace:work-product-component--WellboreTrajectory:WellboreTrajectory-911bb71f-06ab-4deb-8e68-b8c9229dc76b:",
"VerticalMeasurementUnitOfMeasureID": "namespace:reference-data--UnitOfMeasure:m:",
"VerticalCRSID": "namespace:reference-data--CoordinateReferenceSystem:SomeUniqueCoordinateReferenceSystemID:",
"VerticalReferenceID": "Example VerticalReferenceID",
"VerticalMeasurementDescription": "Example VerticalMeasurementDescription"
}
"LogCurveFamilyID": "namespace:reference-data--LogCurveFamily:SomeUniqueLogCurveFamilyID:"
}
],
"ExtensionProperties": {}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment