validation and test modification

Signed-off-by: n0s09by <[email protected]>

Author: n0s09by

src/main/java/hlf/java/rest/client/service/impl/NetworkStatusImpl.java

@@ -127,7 +127,7 @@ public ResponseEntity<ClientResponseModel> generateConfigUpdate(
   private ConfigUpdate createConfigUpdate(
       String channelName, ChannelUpdateParamsDTO organizationDetails) {
     Network network = gateway.getNetwork(channelName);
-    if (network != null) {
+    if (network != null && organizationDetails.getMspDTO() != null) {
       try {
         Channel selectedChannel = network.getChannel();
         byte[] channelConfigBytes = selectedChannel.getChannelConfigurationBytes();
@@ -178,7 +178,11 @@ private ConfigUpdate createConfigUpdate(
       }
     } else {
       log.warn(
-          "Error fetching the channel config: Network cannot be NULL: " + "Network = " + network);
+          "Error fetching the channel config: Network and MSP details cannot be NULL: "
+              + "Network = "
+              + network
+              + " MSP details = "
+              + organizationDetails.getMspDTO());
       return ConfigUpdate.newBuilder().build();
     }
   }
@@ -321,7 +325,7 @@ public ResponseEntity<ClientResponseModel> commitChannelConfigTransaction(
   public ResponseEntity<ClientResponseModel> addOrgToChannel(
       String channelName, ChannelUpdateParamsDTO organizationDetails) {
     Network network = gateway.getNetwork(channelName);
-    if (network != null && user != null) {
+    if (network != null && user != null && organizationDetails.getMspDTO() != null) {
       try {
         Channel selectedChannel = network.getChannel();
         ConfigUpdate configUpdate = createConfigUpdate(channelName, organizationDetails);
@@ -358,11 +362,24 @@ public ResponseEntity<ClientResponseModel> addOrgToChannel(
           new ClientResponseModel(ErrorConstants.NO_ERROR, ErrorCode.SUCCESS.getReason()),
           HttpStatus.OK);
     } else {
-      log.warn("Network and User cannot be NULL: " + "Network = " + network + "and User = " + user);
+      log.warn(
+          "Network, User and MSP details cannot be NULL: "
+              + "Network = "
+              + network
+              + " User = "
+              + user
+              + " and MSP details = "
+              + organizationDetails.getMspDTO());
       return new ResponseEntity<>(
           new ClientResponseModel(
               ErrorCode.NOT_FOUND.getValue(),
-              "Network and User cannot be NULL: " + "Network = " + network + "and User = " + user),
+              "Network, User and MSP details cannot be NULL: "
+                  + "Network = "
+                  + network
+                  + " User = "
+                  + user
+                  + " and MSP details = "
+                  + organizationDetails.getMspDTO()),
           HttpStatus.OK);
     }
   }

src/main/java/hlf/java/rest/client/service/impl/UpdateChannelImpl.java

@@ -32,42 +32,21 @@ public ConfigGroup buildWriteset(ConfigGroup readset, ChannelUpdateParamsDTO org
     Map<String, ConfigGroup> existingOrganizations =
         FabricChannelUtil.getExistingOrgsFromReadset(readset);
 
-    ConfigGroup applicationGroup;
-
-    if (organizationDetails.getMspDTO() != null) {
-      // New org addition scenario
-      // The "Application" group
-      applicationGroup =
-          ConfigGroup.newBuilder()
-              .setModPolicy(FabricClientConstants.CHANNEL_CONFIG_MOD_POLICY_ADMINS)
-              .putAllPolicies(FabricChannelUtil.setApplicationPolicies(readset))
-              .putGroups(newOrgMspId, setNewOrgGroup(newOrgMspId, organizationDetails))
-              // putAllGroups excludes new organization
-              .putAllGroups(existingOrganizations)
-              // Application group version
-              .setVersion(
-                  FabricChannelUtil.retrieveMSPGroupVersionFromReadset(
-                          readset, FabricClientConstants.CHANNEL_CONFIG_GROUP_APPLICATION)
-                      + 1) // will be tied to current version + 1 for this level
-              .build();
-    } else {
-      // The "Application" group
-      applicationGroup =
-          ConfigGroup.newBuilder()
-              .setModPolicy(FabricClientConstants.CHANNEL_CONFIG_MOD_POLICY_ADMINS)
-              .putAllPolicies(FabricChannelUtil.setApplicationPolicies(readset))
-              .putGroups(
-                  newOrgMspId, setAnchorPeerInGroup(newOrgMspId, readset, organizationDetails))
-              // putAllGroups excludes new organization
-              .putAllGroups(existingOrganizations)
-              // Application group version
-              .setVersion(
-                  FabricChannelUtil.retrieveMSPGroupVersionFromReadset(
-                          readset, FabricClientConstants.CHANNEL_CONFIG_GROUP_APPLICATION)
-                      + 1) // will be tied to current version + 1 for this level
-              .build();
-    }
-
+    // New org addition scenario
+    // The "Application" group
+    ConfigGroup applicationGroup =
+        ConfigGroup.newBuilder()
+            .setModPolicy(FabricClientConstants.CHANNEL_CONFIG_MOD_POLICY_ADMINS)
+            .putAllPolicies(FabricChannelUtil.setApplicationPolicies(readset))
+            .putGroups(newOrgMspId, setNewOrgGroup(newOrgMspId, organizationDetails))
+            // putAllGroups excludes new organization
+            .putAllGroups(existingOrganizations)
+            // Application group version
+            .setVersion(
+                FabricChannelUtil.retrieveMSPGroupVersionFromReadset(
+                        readset, FabricClientConstants.CHANNEL_CONFIG_GROUP_APPLICATION)
+                    + 1) // will be tied to current version + 1 for this level
+            .build();
     // the "/Channel" group
     return ConfigGroup.newBuilder()
         .putGroups(FabricClientConstants.CHANNEL_CONFIG_GROUP_APPLICATION, applicationGroup)

src/test/java/hlf/java/rest/client/service/impl/NetworkStatusImplTest.java

@@ -13,6 +13,7 @@
 import hlf.java.rest.client.model.ChannelUpdateParamsDTO;
 import hlf.java.rest.client.model.ClientResponseModel;
 import hlf.java.rest.client.model.CommitChannelParamsDTO;
+import hlf.java.rest.client.model.MSPDTO;
 import hlf.java.rest.client.service.ChannelConfigDeserialization;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -72,6 +73,7 @@ public class NetworkStatusImplTest {
   @Mock private ConfigGroup readset;
 
   @Mock private ConfigGroup writeset;
+  @Mock private MSPDTO mspdto;
 
   @Mock private Builder builder;
 
@@ -106,26 +108,15 @@ public void getChannelFromNetworkTest()
   }
 
   @Test
-  public void generateConfigUpdateTest()
-      throws InvalidProtocolBufferException, InvalidArgumentException, TransactionException {
+  public void generateConfigUpdateTest() throws InvalidProtocolBufferException {
     ResponseEntity<ClientResponseModel> responseEntity =
         new ResponseEntity<>(
             new ClientResponseModel(ErrorConstants.NO_ERROR, "dGhlX2NvbmZpZw=="), HttpStatus.OK);
     Mockito.when(gateway.getNetwork(Mockito.anyString())).thenReturn(network);
-    Mockito.when(network.getChannel()).thenReturn(channel);
-
-    Mockito.when(channel.getChannelConfigurationBytes()).thenReturn(new byte[0]);
     staticConfigUpdate
         .when(() -> ConfigUpdate.parseFrom(Mockito.any(byte[].class)))
         .thenReturn(configUpdate);
     staticConfigUpdate.when(() -> ConfigUpdate.newBuilder()).thenReturn(builder);
-    Mockito.when(configUpdate.getReadSet()).thenReturn(readset);
-    Mockito.when(builder.setChannelId(Mockito.anyString())).thenReturn(builder);
-    Mockito.when(builder.setReadSet(Mockito.any(ConfigGroup.class))).thenReturn(builder);
-    Mockito.when(
-            updateChannel.buildWriteset(Mockito.any(), Mockito.any(ChannelUpdateParamsDTO.class)))
-        .thenReturn(readset);
-    Mockito.when(builder.setWriteSet(Mockito.any(ConfigGroup.class))).thenReturn(builder);
     Mockito.when(builder.build()).thenReturn(configUpdate);
     staticJsonFormat.when(JsonFormat::printer).thenReturn(printer);
     Mockito.when(printer.print(Mockito.any(MessageOrBuilder.class))).thenReturn("the_config");
@@ -201,7 +192,6 @@ public void addOrgToChannelTest() throws InvalidArgumentException, TransactionEx
 
     Mockito.when(gateway.getNetwork(Mockito.anyString())).thenReturn(network);
     Mockito.when(network.getChannel()).thenReturn(channel);
-
     Mockito.when(channel.getChannelConfigurationBytes()).thenReturn(new byte[0]);
     staticConfigUpdate
         .when(() -> ConfigUpdate.parseFrom(Mockito.any(byte[].class)))
@@ -224,10 +214,12 @@ public void addOrgToChannelTest() throws InvalidArgumentException, TransactionEx
                 Mockito.any(UpdateChannelConfiguration.class), Mockito.any(User.class)))
         .thenReturn(outputByteArray);
 
+    Mockito.when(channelUpdateParamsDTO.getMspDTO()).thenReturn(mspdto);
+
     assertEquals(
         responseEntity.getBody().getMessage(),
         networkStatus
-            .addOrgToChannel("some_channel_name", new ChannelUpdateParamsDTO())
+            .addOrgToChannel("some_channel_name", channelUpdateParamsDTO)
             .getBody()
             .getMessage());
   }