Skip to content

Commit ef4da67

Browse files
committed
520 - Update controllers
1 parent ecad254 commit ef4da67

File tree

3 files changed

+15
-14
lines changed

3 files changed

+15
-14
lines changed

server/ee/libs/embedded/embedded-configuration/embedded-configuration-api/src/main/java/com/bytechef/ee/embedded/configuration/facade/ConnectedUserIntegrationFacade.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77

88
package com.bytechef.ee.embedded.configuration.facade;
99

10+
import com.bytechef.ee.embedded.configuration.domain.IntegrationInstance;
1011
import com.bytechef.ee.embedded.configuration.dto.ConnectedUserIntegrationDTO;
1112
import com.bytechef.platform.constant.Environment;
1213
import java.util.List;
@@ -19,7 +20,7 @@
1920
*/
2021
public interface ConnectedUserIntegrationFacade {
2122

22-
void createIntegrationInstance(
23+
IntegrationInstance createIntegrationInstance(
2324
String externalUserId, long integrationId, Map<String, Object> connectionParameters, Environment environment);
2425

2526
void deleteIntegrationInstance(String externalUserId, long integrationInstanceId);

server/ee/libs/embedded/embedded-configuration/embedded-configuration-public-rest/src/main/java/com/bytechef/ee/embedded/configuration/public_/web/rest/IntegrationInstanceApiController.java

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
import static com.bytechef.ee.embedded.configuration.public_.web.rest.util.EnvironmentUtils.getEnvironment;
1111

1212
import com.bytechef.atlas.coordinator.annotation.ConditionalOnCoordinator;
13+
import com.bytechef.ee.embedded.configuration.domain.IntegrationInstance;
1314
import com.bytechef.ee.embedded.configuration.facade.ConnectedUserIntegrationFacade;
1415
import com.bytechef.ee.embedded.configuration.public_.web.rest.model.CreateFrontendIntegrationInstanceRequestConnectionModel;
1516
import com.bytechef.ee.embedded.configuration.public_.web.rest.model.CreateFrontendIntegrationInstanceRequestModel;
@@ -42,7 +43,7 @@ public IntegrationInstanceApiController(ConnectedUserIntegrationFacade connected
4243

4344
@Override
4445
@CrossOrigin
45-
public ResponseEntity<Void> createFrontendIntegrationInstance(
46+
public ResponseEntity<Long> createFrontendIntegrationInstance(
4647
Long id, EnvironmentModel xEnvironment,
4748
CreateFrontendIntegrationInstanceRequestModel createFrontendIntegrationInstanceRequestModel) {
4849

@@ -55,11 +56,10 @@ public ResponseEntity<Void> createFrontendIntegrationInstance(
5556
Map<String, Object> parameters = Objects.requireNonNull(connection)
5657
.getParameters();
5758

58-
connectedUserIntegrationFacade.createIntegrationInstance(
59+
IntegrationInstance integrationInstance = connectedUserIntegrationFacade.createIntegrationInstance(
5960
externalUserId, id, parameters, getEnvironment(xEnvironment));
6061

61-
return ResponseEntity.noContent()
62-
.build();
62+
return ResponseEntity.ok(integrationInstance.getId());
6363
}
6464

6565
@Override
@@ -75,20 +75,20 @@ public ResponseEntity<Void> deleteFrontendIntegrationInstance(Long id) {
7575
}
7676

7777
@Override
78-
public ResponseEntity<Void> createIntegrationInstance(
78+
public ResponseEntity<Long> createIntegrationInstance(
7979
String externalUserId, Long id, EnvironmentModel xEnvironment,
8080
CreateFrontendIntegrationInstanceRequestModel createFrontendIntegrationInstanceRequestModel) {
8181

8282
CreateFrontendIntegrationInstanceRequestConnectionModel connection =
8383
createFrontendIntegrationInstanceRequestModel.getConnection();
8484

85-
connectedUserIntegrationFacade.createIntegrationInstance(
86-
externalUserId, id, Objects.requireNonNull(connection)
87-
.getParameters(),
88-
getEnvironment(xEnvironment));
85+
Map<String, Object> parameters = Objects.requireNonNull(connection)
86+
.getParameters();
87+
88+
IntegrationInstance integrationInstance = connectedUserIntegrationFacade.createIntegrationInstance(
89+
externalUserId, id, parameters, getEnvironment(xEnvironment));
8990

90-
return ResponseEntity.noContent()
91-
.build();
91+
return ResponseEntity.ok(integrationInstance.getId());
9292
}
9393

9494
@Override

server/ee/libs/embedded/embedded-configuration/embedded-configuration-service/src/main/java/com/bytechef/ee/embedded/configuration/facade/ConnectedUserIntegrationFacadeImpl.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ public ConnectedUserIntegrationFacadeImpl(
8181
}
8282

8383
@Override
84-
public void createIntegrationInstance(
84+
public IntegrationInstance createIntegrationInstance(
8585
String externalUserId, long integrationId, Map<String, Object> connectionParameters, Environment environment) {
8686

8787
ConnectedUser connectedUser = connectedUserService.getConnectedUser(externalUserId, environment);
@@ -101,7 +101,7 @@ public void createIntegrationInstance(
101101
connectionDefinition.getVersion(), integrationInstanceConfiguration.getEnvironment(),
102102
integrationInstanceConfiguration.getName(), connectionParameters, ModeType.EMBEDDED);
103103

104-
integrationInstanceService.create(
104+
return integrationInstanceService.create(
105105
connectedUser.getId(), connection.getId(), integrationInstanceConfiguration.getId());
106106
}
107107

0 commit comments

Comments
 (0)