Merge pull request #142 from mcanoy/migrate-engagements

Migrate engagements

Author: mcanoy

pom.xml

@@ -14,10 +14,10 @@
 		<maven.compiler.target>11</maven.compiler.target>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-		<quarkus-plugin.version>1.11.3.Final</quarkus-plugin.version>
+		<quarkus-plugin.version>1.13.7.Final</quarkus-plugin.version>
 		<quarkus.platform.artifact-id>quarkus-bom</quarkus.platform.artifact-id>
 		<quarkus.platform.group-id>io.quarkus</quarkus.platform.group-id>
-		<quarkus.platform.version>1.11.3.Final</quarkus.platform.version>
+		<quarkus.platform.version>1.13.7.Final</quarkus.platform.version>
 		<surefire-plugin.version>3.0.0-M5</surefire-plugin.version>
 		<lombok.version>1.18.12</lombok.version>
 		<sonar.host.url>https://sonarcloud.io</sonar.host.url>

src/main/java/com/redhat/labs/lodestar/resource/EngagementResource.java

@@ -88,7 +88,7 @@ public Response findAllEngagements(@Context UriInfo uriInfo, @QueryParam("pagina
                     includeCommits);
             builder.entity(ePage.getEngagements());
             builder.links(ePage.getLinks(uriInfo.getAbsolutePathBuilder()));
-            ePage.getHeaders().entrySet().stream().forEach(e -> builder.header(e.getKey(), e.getValue()));
+            ePage.getHeaders().entrySet().forEach(e -> builder.header(e.getKey(), e.getValue()));
 
         } else {
             builder.entity(engagementService.getAllEngagements(includeStatus, includeCommits));

src/main/java/com/redhat/labs/lodestar/resource/MigrationResource.java

@@ -3,31 +3,46 @@
 import javax.inject.Inject;
 import javax.ws.rs.PUT;
 import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
 import javax.ws.rs.QueryParam;
 import javax.ws.rs.core.Response;
 
 import org.eclipse.microprofile.metrics.MetricUnits;
-import org.eclipse.microprofile.metrics.annotation.Counted;
 import org.eclipse.microprofile.metrics.annotation.Timed;
 import org.eclipse.microprofile.openapi.annotations.tags.Tag;
 
 import com.redhat.labs.lodestar.service.MigrationService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.List;
 
 @Path("/api/migrate")
-@Tag(name = "Migration", description = "Migratiion services")
+@Tag(name = "Migration", description = "Migration services")
 public class MigrationResource {
+    private static final Logger LOGGER = LoggerFactory.getLogger(MigrationResource.class);
 
     @Inject
     MigrationService migrationService;
 
     @PUT
-    @Counted(name = "migration", description = "How many migation requests have been invoked")
     @Timed(name = "performedMigration", description = "How much time it takes to migrate", unit = MetricUnits.MILLISECONDS)
+    @Produces("application/json")
     public Response migrate(@QueryParam(value = "participants") boolean migrateParticipants,
-            @QueryParam(value = "artifacts") boolean migrateArtifacts,
-            @QueryParam(value = "uuids") boolean migrateUuids, @QueryParam(value = "hosting") boolean migrateHosting) {
-        
-        migrationService.migrate(migrateUuids, migrateParticipants, migrateArtifacts, migrateHosting);
+            @QueryParam("artifacts") boolean migrateArtifacts,
+            @QueryParam("projects") boolean migrateUuids,
+            @QueryParam("hosting") boolean migrateHosting,
+            @QueryParam("engagements") boolean migrateEngagements,
+            @QueryParam("overwrite") boolean overwrite,
+            @QueryParam("uuids") List<String> uuids) {
+
+        try {
+            migrationService.migrate(migrateUuids, migrateParticipants, migrateArtifacts, migrateHosting, migrateEngagements,
+                    overwrite, uuids);
+        } catch (Exception ex) {
+            LOGGER.error("Migration did not complete successfully", ex);
+            return Response.status(Response.Status.BAD_REQUEST).entity("{ \"message\": \"Migration did not complete successfully\"}").build();
+        }
 
         return Response.ok().build();
 

src/main/java/com/redhat/labs/lodestar/service/FileService.java

@@ -52,13 +52,11 @@ public Optional<File> createFile(Integer projectId, String filePath, File file)
     // create multiple files
     public boolean createFiles(Integer projectId, CommitMultiple commit) {
 
-        Response response = null;
-
         // encode actions in commit
         commit.encodeActions();
 
         // call gitlab api to commit
-        response = gitLabService.commitMultipleFiles(projectId, commit);
+        Response response = gitLabService.commitMultipleFiles(projectId, commit);
 
         // decode actions in commit
         commit.decodeActions();
@@ -105,7 +103,7 @@ public Optional<File> deleteFile(Integer projectId, String filePath, String ref)
             // set branch
             file.setBranch(ref);
             // add commit message
-            file.setCommitMessage(String.format("git api deleted file. {}", filePath));
+            file.setCommitMessage(String.format("git api deleted file. %s", filePath));
 
             gitLabService.deleteFile(projectId, filePath, file);
         }