Fixed saving project id for GitLab project pull request decorator.

mc1arke · Jul 8, 2020 · 9c35f70 · 9c35f70
1 parent 3cb1284
commit 9c35f70
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 5 deletions.
diff --git a/.../mc1arke/sonarqube/plugin/server/pullrequest/ws/action/gitlab/SetGitlabBindingAction.java b/.../mc1arke/sonarqube/plugin/server/pullrequest/ws/action/gitlab/SetGitlabBindingAction.java
@@ -19,6 +19,7 @@
 package com.github.mc1arke.sonarqube.plugin.server.pullrequest.ws.action.gitlab;
 
 import org.sonar.api.server.ws.Request;
+import org.sonar.api.server.ws.WebService;
 import org.sonar.db.DbClient;
 import org.sonar.db.alm.setting.ProjectAlmSettingDto;
 import org.sonar.server.component.ComponentFinder;
@@ -27,15 +28,25 @@
 import com.github.mc1arke.sonarqube.plugin.server.pullrequest.ws.action.SetBindingAction;
 
 public class SetGitlabBindingAction extends SetBindingAction {
+ private final static String REPOSITORY_PARAMETER = "repository";
 
  public SetGitlabBindingAction(DbClient dbClient, ComponentFinder componentFinder, UserSession userSession) {
  super(dbClient, componentFinder, userSession, "set_gitlab_binding");
  }
 
+ @Override
+ protected void configureAction(WebService.NewAction action) {
+ super.configureAction(action);
+ action.createParam(REPOSITORY_PARAMETER).setRequired(true);
+ }
+
  @Override
  protected ProjectAlmSettingDto createProjectAlmSettingDto(String projectUuid, String settingsUuid,
  Request request) {
- return new ProjectAlmSettingDto().setProjectUuid(projectUuid).setAlmSettingUuid(settingsUuid);
+ return new ProjectAlmSettingDto()
+ .setProjectUuid(projectUuid)
+ .setAlmSettingUuid(settingsUuid)
+ .setAlmRepo(request.mandatoryParam(REPOSITORY_PARAMETER));
  }
 
 }
diff --git a/...arke/sonarqube/plugin/server/pullrequest/ws/action/gitlab/SetGitlabBindingActionTest.java b/...arke/sonarqube/plugin/server/pullrequest/ws/action/gitlab/SetGitlabBindingActionTest.java
@@ -1,8 +1,7 @@
 package com.github.mc1arke.sonarqube.plugin.server.pullrequest.ws.action.gitlab;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verifyNoMoreInteractions;
+import static org.mockito.Mockito.*;
 
 import org.junit.Test;
 import org.sonar.api.server.ws.Request;
@@ -20,12 +19,13 @@ public void testCreateProjectAlmSettingDto() {
  ComponentFinder componentFinder = mock(ComponentFinder.class);
 
  Request request = mock(Request.class);
+ when(request.mandatoryParam("repository")).thenReturn("repositoryId");
 
  SetGitlabBindingAction testCase = new SetGitlabBindingAction(dbClient, componentFinder, userSession);
  ProjectAlmSettingDto result = testCase.createProjectAlmSettingDto("projectUuid", "settingsUuid", request);
 
- assertThat(result).isEqualToComparingFieldByField(new ProjectAlmSettingDto().setProjectUuid("projectUuid").setAlmSettingUuid("settingsUuid"));
+ assertThat(result).isEqualToComparingFieldByField(new ProjectAlmSettingDto().setProjectUuid("projectUuid").setAlmSettingUuid("settingsUuid").setAlmRepo("repositoryId"));
+ verify(request).mandatoryParam("repository");
  verifyNoMoreInteractions(request);
-
  }
 }