Pull request #37: Feature/VNCS-287 as admin edit existing assetMerge in SOF/inventory-system from feature/VNCS-287-as_admin_edit_existing_asset to master
* commit '71576256b057b2dc1499cd3a3e156ec332dfb520':
VNCS-287 Query in AssetDefinitionRepository revised
VNCS-287 EditAssetDetails was replaced with Map
VNCS-287 Added Tests and revised method for editing assets
VNCS-287 Added Endpoint for editing assets
Added endpoint to edit asset. Added Modi...
Merge branch 'master' of https://bitbucket.it-economics.de/scm/sof/inventory-system into feature/VNCS-287-as_admin_edit_existing_asset Conflicts:
inventory-system/src/test/java/com/inventory/api/v1/account/service/AccountServiceTest.java
inventory-system/src/test/java/com/inventory/api/v1/asset/service/AssetServiceTest.java
Merge branch 'master' of https://bitbucket.it-economics.de/scm/sof/inventory-system into feature/VNCS-287-as_admin_edit_existing_asset Conflicts:
inventory-system/src/main/java/com/inventory/api/v1/asset/controller/InventoryController.java
inventory-system/src/main/java/com/inventory/api/v1/asset/service/InventoryService.java
Pull request #34: VNCS-299-Move-mapper-logic-from-Controllers-to-ServicesMerge in SOF/inventory-system from VNCS-299-Move-mapper-logic-from-Controllers-to-Services to master
* commit 'db942cccab9bbb84e8513697ed48093fc6423ca9':
VNCS-299 Rebase changes
VNCS-299 Refactor assetService and create method getAssetsByUsername
Merge branch 'master' of https://bitbucket.it-economics.de/scm/sof/inventory-system into VNCS-299-Move-mapper-logic-from-Controllers-to-Services Conflicts:
inventory-system/src/main/java/com/inventory/api/v1/asset/controller/AssetController.java
inventory-system/src/test/java/com/inventory/api/v1/asset/service/AssetServiceTest.java
Pull request #32: VNCS-299 Move mapper logic from Controllers to ServicesMerge in SOF/inventory-system from VNCS-299-Move-mapper-logic-from-Controllers-to-Services to master
* commit '7bbbe0019c8cbcef3390a17f9fb0bc369ac01016':
VNCS-299 Move mapper logic from AssetController to AssetService
VNCS-299 Move mapper logic from AccountController to AccountService
Pull request #31: VNCS-298 Split InventoryMapper by domain modelsMerge in SOF/inventory-system from feature/VNCS-298-split-invenotrymapper-by-domain-models to master
* commit '21b45c63d80aa168d8841c88c65ab68445a42f74':
VNCS-298 Added @UtilityClass to mapper classes
VNCS-298 Split InventoryMapper by domain models
Pull request #29: Refactor the exception handling logicMerge in SOF/inventory-system from feature/VNCS-308-refactor-the-exception-handling-logic to master
* commit 'e1dc5334e968708303bff39b93c749163255bcba':
refactor exception handling
Pull request #30: VNCS-304 filter by locationMerge in SOF/inventory-system from VNCS-304-filter-by-location to master
* commit '240f89f223c53e323a41e5daa429d1fb1b2a8485':
VNCS-304 move returnLocation method to LocationService class
VNCS-304 change name of constant
VNCS-304 refactor location validation
Pull request #21: VNCS-288 asset deleteMerge in SOF/inventory-system from VNCS-288-asset-delete to master
* commit '76d450651dd6fb7e229e0595e9c3e5510709a6a0':
VNCS-288-asset-delete Method and Exception Refactored - from IllegalArgumentException to InventoryException
VNCS-288-asset-delete Method and Exception Refactored - from IllegalArgumentException to InventoryException
deleting asset but not only from Admin
VNCS-288-asse...
Pull request #26: Feature/VNCS-306 refactor inventory applicationMerge in SOF/inventory-system from feature/VNCS-306-refactor-inventory-application to master
* commit '916d522f01eef19e72c241568452e17113f7a67a':
optimise imports in the whole project
fix asset controller endpoint tests
rename Inventory controller and service to Asset controller and service
rename endpoints to appropriate URL paths
move getAllAssignedAssets into InventoryController.j...