Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
TEHIK
TEIS
office-api-gateway
Commits
800cf4b9
Commit
800cf4b9
authored
Mar 22, 2021
by
Siiri Tann
Browse files
Resolve TEIS-1751
parent
ff2edbec
Changes
9
Hide whitespace changes
Inline
Side-by-side
api-gateway-lib/src/main/java/ee/sm/ti/teis/officegateway/proceedings/proceeding/inspection/topic/ProceedingInspectionTopicDto.java
0 → 100644
View file @
800cf4b9
package
ee.sm.ti.teis.officegateway.proceedings.proceeding.inspection.topic
;
import
ee.sm.ti.teis.commongateway.classifier.ClassifierItemLightDto
;
import
ee.sm.ti.teis.types.enums.ObjectStatus
;
import
lombok.AllArgsConstructor
;
import
lombok.Builder
;
import
lombok.Data
;
import
lombok.NoArgsConstructor
;
import
java.util.UUID
;
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
public
class
ProceedingInspectionTopicDto
{
private
UUID
id
;
private
UUID
proceedingId
;
private
UUID
upperProceedingInspectionTopicId
;
private
String
inspectionTopicId
;
private
Integer
inspectionTopicLevel
;
private
String
inspectionTopicName
;
private
String
inspectionTopicDescription
;
private
Integer
inspectionTopicSeqNo
;
private
ClassifierItemLightDto
source
;
private
ObjectStatus
objectStatus
;
}
api-gateway-lib/src/main/java/ee/sm/ti/teis/officegateway/proceedings/proceeding/inspection/topic/ProceedingTopicDto.java
View file @
800cf4b9
...
...
@@ -11,6 +11,7 @@ import java.util.UUID;
@Data
@Builder
@Deprecated
(
since
=
"1.23.0"
,
forRemoval
=
true
)
@NoArgsConstructor
@AllArgsConstructor
public
class
ProceedingTopicDto
{
...
...
api-gateway-lib/src/main/java/ee/sm/ti/teis/officegateway/proceedings/proceeding/inspection/topic/request/ProceedingTopicRequest.java
→
api-gateway-lib/src/main/java/ee/sm/ti/teis/officegateway/proceedings/proceeding/inspection/topic/request/
Get
Proceeding
Inspection
TopicRequest.java
View file @
800cf4b9
...
...
@@ -5,11 +5,11 @@ import ee.sm.ti.teis.ErrorDTO;
import
java.util.UUID
;
public
class
ProceedingTopicRequest
extends
AbstractDTO
<
UUID
,
ErrorDTO
>
{
public
static
final
String
ROUTING_KEY
=
"api.ProceedingTopicRequest"
;
public
class
Get
Proceeding
Inspection
TopicRequest
extends
AbstractDTO
<
UUID
,
ErrorDTO
>
{
public
static
final
String
ROUTING_KEY
=
"api.
Get
Proceeding
Inspection
TopicRequest"
;
@Override
public
String
routingKey
()
{
return
ROUTING_KEY
;
}
}
\ No newline at end of file
}
api-gateway-lib/src/main/java/ee/sm/ti/teis/officegateway/proceedings/proceeding/inspection/topic/request/UpdateProceedingTopicRequest.java
→
api-gateway-lib/src/main/java/ee/sm/ti/teis/officegateway/proceedings/proceeding/inspection/topic/request/UpdateProceeding
Inspection
TopicRequest.java
View file @
800cf4b9
...
...
@@ -10,8 +10,8 @@ import lombok.NoArgsConstructor;
import
java.util.List
;
import
java.util.UUID
;
public
class
UpdateProceedingTopicRequest
extends
AbstractDTO
<
UpdateProceedingTopicRequest
.
Parameters
,
ErrorDTO
>
{
public
static
final
String
ROUTING_KEY
=
"api.UpdateProceedingTopicRequest"
;
public
class
UpdateProceeding
Inspection
TopicRequest
extends
AbstractDTO
<
UpdateProceeding
Inspection
TopicRequest
.
Parameters
,
ErrorDTO
>
{
public
static
final
String
ROUTING_KEY
=
"api.UpdateProceeding
Inspection
TopicRequest"
;
@Override
public
String
routingKey
()
{
...
...
@@ -25,4 +25,4 @@ public class UpdateProceedingTopicRequest extends AbstractDTO<UpdateProceedingTo
private
UUID
id
;
private
List
<
ClassifierItemLightDto
>
inspectionTopicCodes
;
}
}
\ No newline at end of file
}
api-gateway-lib/src/main/java/ee/sm/ti/teis/officegateway/proceedings/proceeding/inspection/topic/response/ProceedingTopicResponse.java
→
api-gateway-lib/src/main/java/ee/sm/ti/teis/officegateway/proceedings/proceeding/inspection/topic/response/
Get
Proceeding
Inspection
TopicResponse.java
View file @
800cf4b9
...
...
@@ -2,12 +2,12 @@ package ee.sm.ti.teis.officegateway.proceedings.proceeding.inspection.topic.resp
import
ee.sm.ti.teis.AbstractDTO
;
import
ee.sm.ti.teis.ErrorDTO
;
import
ee.sm.ti.teis.officegateway.proceedings.proceeding.inspection.topic.ProceedingTopicDto
;
import
ee.sm.ti.teis.officegateway.proceedings.proceeding.inspection.topic.Proceeding
Inspection
TopicDto
;
import
java.util.List
;
public
class
ProceedingTopicResponse
extends
AbstractDTO
<
List
<
ProceedingTopicDto
>,
ErrorDTO
>
{
public
static
final
String
ROUTING_KEY
=
"api.ProceedingTopicResponse"
;
public
class
Get
Proceeding
Inspection
TopicResponse
extends
AbstractDTO
<
List
<
Proceeding
Inspection
TopicDto
>,
ErrorDTO
>
{
public
static
final
String
ROUTING_KEY
=
"api.
Get
Proceeding
Inspection
TopicResponse"
;
@Override
public
String
routingKey
()
{
...
...
api-gateway-lib/src/main/java/ee/sm/ti/teis/officegateway/proceedings/proceeding/inspection/topic/response/UpdateProceedingTopicResponse.java
→
api-gateway-lib/src/main/java/ee/sm/ti/teis/officegateway/proceedings/proceeding/inspection/topic/response/UpdateProceeding
Inspection
TopicResponse.java
View file @
800cf4b9
...
...
@@ -6,8 +6,8 @@ import ee.sm.ti.teis.officegateway.proceedings.proceeding.inspection.topic.Proce
import
java.util.List
;
public
class
UpdateProceedingTopicResponse
extends
AbstractDTO
<
List
<
ProceedingTopicDto
>,
ErrorDTO
>
{
public
static
final
String
ROUTING_KEY
=
"api.UpdateProceedingTopicResponse"
;
public
class
UpdateProceeding
Inspection
TopicResponse
extends
AbstractDTO
<
List
<
ProceedingTopicDto
>,
ErrorDTO
>
{
public
static
final
String
ROUTING_KEY
=
"api.UpdateProceeding
Inspection
TopicResponse"
;
@Override
public
String
routingKey
()
{
...
...
api-gateway/src/integTest/java/ee/sm/ti/teis/officegateway/proceedings/proceeding/inspection/topic/ProceedingTopicControllerTest.java
→
api-gateway/src/integTest/java/ee/sm/ti/teis/officegateway/proceedings/proceeding/inspection/topic/Proceeding
Inspection
TopicControllerTest.java
View file @
800cf4b9
...
...
@@ -13,10 +13,10 @@ import java.util.List;
import
static
java
.
util
.
UUID
.
randomUUID
;
import
static
org
.
junit
.
jupiter
.
api
.
Assertions
.
assertThrows
;
class
ProceedingTopicControllerTest
extends
OfficeApiGatewayTestBase
{
class
Proceeding
Inspection
TopicControllerTest
extends
OfficeApiGatewayTestBase
{
@Autowired
ProceedingTopicController
controller
;
Proceeding
Inspection
TopicController
controller
;
@Test
void
updateTopics
()
{
...
...
@@ -29,4 +29,4 @@ class ProceedingTopicControllerTest extends OfficeApiGatewayTestBase {
void
getTopics
()
{
assertThrows
(
NoResponseFromRabbitException
.
class
,
()
->
controller
.
getTopics
(
randomUUID
(),
new
RequestMetaDTO
()));
}
}
\ No newline at end of file
}
api-gateway/src/main/java/ee/sm/ti/teis/officegateway/proceedings/proceeding/inspection/topic/ProceedingTopicController.java
→
api-gateway/src/main/java/ee/sm/ti/teis/officegateway/proceedings/proceeding/inspection/topic/Proceeding
Inspection
TopicController.java
View file @
800cf4b9
...
...
@@ -3,8 +3,8 @@ package ee.sm.ti.teis.officegateway.proceedings.proceeding.inspection.topic;
import
ee.sm.ti.teis.commongateway.classifier.ClassifierItemLightDto
;
import
ee.sm.ti.teis.gatewaycommon.controller.TeisBaseController
;
import
ee.sm.ti.teis.gatewaycommon.rabbit.RequestProcessingService
;
import
ee.sm.ti.teis.officegateway.proceedings.proceeding.inspection.topic.request.ProceedingTopicRequest
;
import
ee.sm.ti.teis.officegateway.proceedings.proceeding.inspection.topic.request.UpdateProceedingTopicRequest
;
import
ee.sm.ti.teis.officegateway.proceedings.proceeding.inspection.topic.request.
Get
Proceeding
Inspection
TopicRequest
;
import
ee.sm.ti.teis.officegateway.proceedings.proceeding.inspection.topic.request.UpdateProceeding
Inspection
TopicRequest
;
import
ee.sm.ti.teis.servicerequest.RequestMetaDTO
;
import
io.swagger.annotations.ApiImplicitParam
;
import
io.swagger.annotations.ApiImplicitParams
;
...
...
@@ -18,7 +18,7 @@ import java.util.UUID;
@RestController
@RequestMapping
(
"proceedings/{id}/inspection-topics"
)
@RequiredArgsConstructor
public
class
ProceedingTopicController
extends
TeisBaseController
{
public
class
Proceeding
Inspection
TopicController
extends
TeisBaseController
{
private
final
RequestProcessingService
service
;
...
...
@@ -27,23 +27,23 @@ public class ProceedingTopicController extends TeisBaseController {
@ApiImplicitParams
(
@ApiImplicitParam
(
name
=
"id"
,
value
=
"${teis.api.messages.proceeding.id}"
))
@PutMapping
public
List
<
ProceedingTopicDto
>
updateTopics
(
@PathVariable
UUID
id
,
@RequestBody
List
<
ClassifierItemLightDto
>
inspectionTopicCodes
,
RequestMetaDTO
requestMetaDTO
)
{
UpdateProceedingTopicRequest
request
=
new
UpdateProceedingTopicRequest
();
request
.
setPayload
(
new
UpdateProceedingTopicRequest
.
Parameters
(
id
,
inspectionTopicCodes
),
requestMetaDTO
);
@RequestBody
List
<
ClassifierItemLightDto
>
inspectionTopicCodes
,
RequestMetaDTO
requestMetaDTO
)
{
UpdateProceeding
Inspection
TopicRequest
request
=
new
UpdateProceeding
Inspection
TopicRequest
();
request
.
setPayload
(
new
UpdateProceeding
Inspection
TopicRequest
.
Parameters
(
id
,
inspectionTopicCodes
),
requestMetaDTO
);
return
(
List
<
ProceedingTopicDto
>)
service
.
sendAndReceive
(
request
);
}
@ApiOperation
(
value
=
"${teis.api.messages.proceeding.get-proceeding-inspection-topics}"
,
response
=
ProceedingTopicDto
.
class
)
response
=
Proceeding
Inspection
TopicDto
.
class
)
@ApiImplicitParams
(
@ApiImplicitParam
(
name
=
"id"
,
value
=
"${teis.api.messages.proceeding.id}"
))
@GetMapping
public
List
<
ProceedingTopicDto
>
getTopics
(
@PathVariable
UUID
id
,
RequestMetaDTO
requestMetaDTO
)
{
ProceedingTopicRequest
request
=
new
ProceedingTopicRequest
();
public
List
<
Proceeding
Inspection
TopicDto
>
getTopics
(
@PathVariable
UUID
id
,
RequestMetaDTO
requestMetaDTO
)
{
Get
Proceeding
Inspection
TopicRequest
request
=
new
Get
Proceeding
Inspection
TopicRequest
();
request
.
setPayload
(
id
,
requestMetaDTO
);
return
(
List
<
ProceedingTopicDto
>)
service
.
sendAndReceive
(
request
);
return
(
List
<
Proceeding
Inspection
TopicDto
>)
service
.
sendAndReceive
(
request
);
}
}
gradle.properties
View file @
800cf4b9
theGroup
=
ee.sm.ti.teis
theVersion
=
1.2
2
.0
theVersion
=
1.2
3
.0
-SNAPSHOT
commonsVersion
=
1.22.0
commonApiGatewayVersion
=
1.22.0
pluginVersion
=
1.3.0
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment