Skip to content

Commit

Permalink
Merge pull request #208 from bci-oss/bug/invalidModelIssue
Browse files Browse the repository at this point in the history 
fix:Fix for invalid models HTTP 500 error issue
  • Loading branch information
@tunacicek
tunacicek authored Dec 18, 2023
2 parents bfaf6e2 + 28cafcb commit 0f0d3cd
Show file tree
Hide file tree
Showing 8 changed files with 2,877 additions and 0 deletions.
8 changes: 8 additions & 0 deletions backend/src/main/java/org/eclipse/tractusx/semantics/ApiExceptionHandler.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -132,4 +132,12 @@ public ResponseEntity<ErrorResponse> handleInvalidStateTransitionException( fina
.path( request.getRequestURI() ) ), HttpStatus.BAD_REQUEST );
}

@ExceptionHandler( org.apache.jena.atlas.web.HttpException.class )
public ResponseEntity<ErrorResponse> handleHttpException( final HttpServletRequest request, final org.apache.jena.atlas.web.HttpException httpException ) {
return new ResponseEntity<>( new ErrorResponse()
.error( new Error()
.message( httpException.getResponse() )
.path( request.getRequestURI() ) ), HttpStatus.BAD_REQUEST );
}

}
42 changes: 42 additions & 0 deletions backend/src/test/java/org/eclipse/tractusx/semantics/hub/ModelsApiTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -914,6 +914,48 @@ public void testDependentModelBAMM() throws Exception {
.andExpect( status().isOk() );
}

@Test
public void testInvalidDependentModelBAMMModel() throws Exception {

//Given
mvc.perform( postBAMM( TestUtils.getTTLFile( "ContactInformation-2.0.0.ttl" ), "DRAFT" ) )
.andDo( MockMvcResultHandlers.print() )
.andExpect( status().isOk() );
mvc.perform( postBAMM( TestUtils.getTTLFile( "Pcf-3.0.0.ttl" ), "DRAFT" ) )
.andDo( MockMvcResultHandlers.print() )
.andExpect( status().isOk() );

mvc.perform( postBAMM( TestUtils.getTTLFile( "PhysicalDimensions-2.0.0.ttl" ), "DRAFT" ) )
.andDo( MockMvcResultHandlers.print() )
.andExpect( status().isOk() );

mvc.perform( postBAMM( TestUtils.getTTLFile( "SerialPartTypization-2.0.0.ttl" ), "DRAFT" ) )
.andDo( MockMvcResultHandlers.print() )
.andExpect( status().isOk() );

//When & Then
mvc.perform( postBAMM( TestUtils.getTTLFile( "TransmissionPass.ttl" ), "DRAFT" ) )
.andDo( MockMvcResultHandlers.print() )
.andExpect( status().isBadRequest() )
.andExpect( jsonPath( "$.error.message", containsString("Bad IRI" ) ) );
}


@Test
public void testInvalidSAMMModel() throws Exception {
//Given
mvc.perform( MockMvcRequestBuilders.post( "/api/v1/models" )
.queryParam( "type", "SAMM" )
.queryParam( "status", "DRAFT" )
.accept( MediaType.APPLICATION_JSON )
.contentType( MediaType.TEXT_PLAIN )
.content( TestUtils.getTTLFile( "DigitalProductPassport-samm.ttl" ) )
.with( jwtTokenFactory.allRoles() ) )
.andDo( MockMvcResultHandlers.print() )
.andExpect( status().isBadRequest() )
.andExpect( jsonPath( "$.error.message", containsString( "Bad IRI" ) ) );
}

private static String toMovementUrn(String urn){
return urn + "Movement";
}
Expand Down
105 changes: 105 additions & 0 deletions ...ources/org/eclipse/tractusx/semantics/hub/persistence/models/ContactInformation-2.0.0.ttl
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,105 @@
#######################################################################
# Copyright (c) 2023 Robert Bosch Manufacturing Solutions GmbH
# Copyright (c) 2023 T-Systems International GmbH
# Copyright (c) 2023 Contributors to the Eclipse Foundation
#
# See the NOTICE file(s) distributed with this work for additional
# information regarding copyright ownership.
#
# This work is made available under the terms of the
# Creative Commons Attribution 4.0 International (CC-BY-4.0) license,
# which is available at
# https://creativecommons.org/licenses/by/4.0/legalcode.
#
# SPDX-License-Identifier: CC-BY-4.0
#######################################################################

@prefix bamm: <urn:bamm:io.openmanufacturing:meta-model:2.0.0#>.
@prefix bamm-c: <urn:bamm:io.openmanufacturing:characteristic:2.0.0#>.
@prefix bamm-e: <urn:bamm:io.openmanufacturing:entity:2.0.0#>.
@prefix unit: <urn:bamm:io.openmanufacturing:unit:2.0.0#>.
@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>.
@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#>.
@prefix xsd: <http://www.w3.org/2001/XMLSchema#>.
@prefix : <urn:bamm:io.catenax.shared.contact_information:2.0.0#>.

:ContactCharacteristic a bamm:Characteristic;
bamm:name "ContactCharacteristic";
bamm:preferredName "Contact Characteristic"@en;
bamm:description "Characteristic describing information on how to contact an organization"@en;
bamm:dataType :ContactEntity .
:ContactEntity a bamm:Entity;
bamm:name "ContactEntity";
bamm:preferredName "Contact Entity"@en;
bamm:description "Entity to bundle the properties for the information on how to contact an organization"@en;
bamm:properties ([
bamm:property :website;
bamm:optional "true"^^xsd:boolean
] [
bamm:property :phoneNumber;
bamm:optional "true"^^xsd:boolean
] [
bamm:property :email;
bamm:optional "true"^^xsd:boolean
] [
bamm:property :faxNumber;
bamm:optional "true"^^xsd:boolean
]) .
:contactProperty a bamm:Property;
bamm:name "contactProperty";
bamm:preferredName "Contact Property"@en;
bamm:description "Property describing contact information for an organization"@en;
bamm:characteristic :ContactCharacteristic .
:WebsiteCharacteristic a bamm:Characteristic;
bamm:name "WebsiteCharacteristic";
bamm:preferredName "website"@en;
bamm:description "Address of the website"@en;
bamm:dataType xsd:anyURI.
:website a bamm:Property;
bamm:name "website";
bamm:preferredName "website"@en;
bamm:description "Website of the contact."@en;
bamm:characteristic :WebsiteCharacteristic;
bamm:exampleValue "https://www.samsung.com"^^xsd:anyURI.
:phoneNumber a bamm:Property;
bamm:name "phoneNumber";
bamm:preferredName "phone number"@en;
bamm:description "Phone number with country and area code"@en;
bamm:characteristic :PhoneNumberTrait;
bamm:exampleValue "+49 89 1234567890".
:email a bamm:Property;
bamm:name "email";
bamm:preferredName "email"@en;
bamm:description "An email address"@en;
bamm:characteristic :EMailTrait;
bamm:exampleValue "[email protected]".
:faxNumber a bamm:Property;
bamm:name "faxNumber";
bamm:preferredName "faxNumber"@en;
bamm:description "Fax number with country and area code"@en;
bamm:characteristic :PhoneNumberTrait;
bamm:exampleValue "+49 89 0987654321".
:ContactInformation a bamm:Aspect;
bamm:name "ContactInformation";
bamm:properties (:contactProperty);
bamm:operations ();
bamm:preferredName "Contact information"@en;
bamm:description "Entity encapsulating the contact details"@en;
bamm:see <https://www.plattform-i40.de/IP/Redaktion/DE/Downloads/Publikation/Spezifikation_Submodel-Templates.html>.
:PhoneNumberTrait a bamm-c:Trait;
bamm:name "PhoneNumberTrait";
bamm-c:baseCharacteristic bamm-c:Text;
bamm-c:constraint :PhoneNumberConstraint.
:PhoneNumberConstraint a bamm-c:RegularExpressionConstraint;
bamm:name "PhoneNumberConstraint";
bamm:description "Constraint to allow only numbers, whitespaces and an optional leading + sign."@en;
bamm:preferredName "PhoneNumberConstraint"@en;
bamm:value "^[+]?[0-9 ]+$".
:EMailTrait a bamm-c:Trait;
bamm:name "SupplierMailTrait";
bamm-c:baseCharacteristic bamm-c:Text;
bamm-c:constraint :EMailConstraint.
:EMailConstraint a bamm-c:RegularExpressionConstraint;
bamm:name "EMailConstraint";
bamm:value "^[a-zA-Z0-9.!#$%&’*+\\/=?^_`{|}~-]+@[a-zA-Z0-9-]+(?:\\.[a-zA-Z0-9-]+)*$";
bamm:description "Regular expression for mail address as defined in W3C (see https://html.spec.whatwg.org/multipage/input.html#valid-e-mail-address)"@en.
Loading

0 comments on commit 0f0d3cd

Please sign in to comment.