Refactored upsert path and added tests

.github/workflows/TestAndCompile.yml

@@ -10,14 +10,16 @@ jobs:
 #        os: [macos-latest, windows-latest, ubuntu-latest]
     env:
       TEST_TOKEN: ${{ secrets.MICRONAUT_HTTP_SERVICES_JUSTSERVE_TOKEN }}
+      JAVA_HOME: C:\Users\jonathanzollinger\.jdks\graalvm-ce-21.0.2
+
     steps:
       - uses: actions/checkout@v4
-      - uses: graalvm/setup-graalvm@v1
-        with:
-          java-version: '21'
-          distribution: 'graalvm'
-          github-token: ${{ secrets.GITHUB_TOKEN }}
-          native-image-job-reports: 'true'
+      # - uses: graalvm/setup-graalvm@v1
+      #   with:
+      #     java-version: '21'
+      #     distribution: 'graalvm'
+      #     github-token: ${{ secrets.GITHUB_TOKEN }}
+      #     native-image-job-reports: 'true'
       - name: call gradle to run tests and then compile
         run: ./gradlew test nativeCompile
       - name: upload binary

build.gradle.kts

@@ -35,6 +35,7 @@ dependencies {
     implementation("org.simplejavamail:simple-java-mail:8.12.6")
     implementation("org.jsoup:jsoup:1.21.2")
     testImplementation("net.datafaker:datafaker:2.5.1")
+    testImplementation("org.apache.commons:commons-lang3:3.20.0")
     compileOnly("org.projectlombok:lombok")
     runtimeOnly("ch.qos.logback:logback-classic")
     runtimeOnly("org.yaml:snakeyaml")
@@ -58,6 +59,16 @@ tasks.withType<ProcessResources> {
     }
 }
 
+tasks.withType<Test> {
+    testLogging {
+        events("passed", "skipped", "failed")
+        showStandardStreams = true
+        exceptionFormat = org.gradle.api.tasks.testing.logging.TestExceptionFormat.FULL
+    }
+    // Exclude EmailParserSpec until we can provide test .eml files without PII data
+    exclude("**/EmailParserSpec.class")
+}
+
 micronaut {
     testRuntime("spock2")
     openapi {

gradle.properties

@@ -1,3 +1,3 @@
 micronautVersion=4.8.3
-justserveCliVersion=0.0.7
+justserveCliVersion=0.0.8-SNAPSHOT
 org.gradle.console=rich

src/main/java/org/justserve/cli/JustServeCommand.java

@@ -1,16 +1,13 @@
 package org.justserve.cli;
 
 import io.micronaut.configuration.picocli.PicocliRunner;
-import org.justserve.cli.command.BaseCommand;
-import org.justserve.cli.command.GetTempPassword;
-import org.justserve.cli.command.MakeOrgAdmin;
-import org.justserve.cli.command.UnReassignProjects;
+import org.justserve.cli.command.*;
 import org.justserve.cli.util.JustServeVersionProvider;
 import picocli.CommandLine.Command;
 import picocli.CommandLine.ParameterException;
 import picocli.jansi.graalvm.AnsiConsole;
 
-@Command(subcommands = {GetTempPassword.class, MakeOrgAdmin.class, UnReassignProjects.class},
+@Command(subcommands = {GetTempPassword.class, MakeOrgAdmin.class, UnReassignProjects.class, AssignOrgToProject.class},
         mixinStandardHelpOptions = true,
         name = "justserve", versionProvider = JustServeVersionProvider.class,
         description = "justserve-cli is a terminal tool to help specialists and admin using JustServe")

src/main/java/org/justserve/cli/command/AssignOrgToProject.java

@@ -0,0 +1,57 @@
+package org.justserve.cli.command;
+
+import io.micronaut.http.HttpResponse;
+import io.micronaut.http.HttpStatus;
+import io.micronaut.http.client.exceptions.HttpClientResponseException;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
+import lombok.extern.slf4j.Slf4j;
+import org.justserve.client.ProjectClient;
+import picocli.CommandLine.Command;
+import picocli.CommandLine.Option;
+
+import java.util.UUID;
+
+import static org.justserve.cli.util.JustServePrinter.printError;
+import static org.justserve.cli.util.JustServePrinter.printNormal;
+
+@Slf4j
+@Command(name = "assignOrgToProject", description = "Assigns an organization to a project", mixinStandardHelpOptions = true)
+public class AssignOrgToProject extends BaseCommand implements Runnable {
+
+    @Option(names = {"--project", "-p"}, description = "the project ID", required = true)
+    private UUID projectId;
+
+    @Option(names = {"--org", "-o"}, description = "the organization ID", required = true)
+    private UUID orgId;
+
+    @Inject
+    Provider<ProjectClient> projectClientProvider;
+
+    @Override
+    public void run() {
+        if (isTokenInvalid()) {
+            return;
+        }
+
+        ProjectClient client = projectClientProvider.get();
+
+        try {
+            log.atTrace().log("Assigning organization {} to project {}", orgId, projectId);
+            HttpResponse<Object> response = client.assignOrganizationToProject(projectId, orgId);
+            if (response.status() == HttpStatus.OK) {
+                printNormal("Successfully assigned organization %s to project %s", orgId, projectId);
+                log.atTrace().log("received api response status: {}", response.status());
+            } else {
+                printError("Failed to assign organization " + orgId + " to project " + projectId +
+                        ". Expected HTTP Status 'OK', but got " + response.status());
+                log.atError().log("Failed to assign organization {} to project {}. Expected HTTP Status 'OK', but got {}",
+                        orgId, projectId, response.status());
+            }
+        } catch (HttpClientResponseException e) {
+            printError("Failed to assign organization %s to project %s. (%s: %s)",
+                    orgId, projectId, e.getStatus().getCode(), e.getMessage());
+            log.atError().setCause(e).log("Error response from API: {}", e.getResponse().body());
+        }
+    }
+}

src/main/java/org/justserve/cli/command/MakeOrgAdmin.java

@@ -45,24 +45,22 @@ public void run() {
         }
         DynamicRoutingClient dynamicRoutingClient = dynamicRoutingClientProvider.get();
         // since we allow submitting orgId's and orgUrl, convert any slugs to orgId's
-        Map<Org, @Nullable UUID> orgUuidMap = Arrays.stream(orgs).distinct().parallel()
-                .collect(Collectors.toMap(
-                        org -> org,
-                        org -> org instanceof OrgId ? ((OrgId) org).getId() : dynamicRoutingClient
-                                .getOrgIdFromSlug(((OrgSlug) org).getSlug()).body().getId()
-                ));
-        if (orgUuidMap.values().stream().anyMatch(Objects::isNull)) {
-            // provide a list of all invalid org slugs, not just the first failure
-            List<OrgSlug> invalidOrgSlugs = new ArrayList<>();
-            orgUuidMap.entrySet().stream()
-                    .filter(entry -> entry.getValue() == null)
-                    .map(entry -> (OrgSlug) entry.getKey())
-                    .forEach(invalidOrgSlugs::add);
-            printError("The following organization slugs are invalid: " + invalidOrgSlugs.stream()
-                    .map(OrgSlug::getSlug)
-                    .collect(Collectors.joining(", ")));
-            return;
-        }
+        Map<Org, UUID> orgUuidMap = Arrays.stream(orgs).distinct().parallel()
+                .map(org -> {
+                    if (org instanceof OrgId) {
+                        return new AbstractMap.SimpleEntry<>(org, ((OrgId) org).getId());
+                    }
+                    try {
+                        return new AbstractMap.SimpleEntry<>(org, dynamicRoutingClient
+                                .getOrgIdFromSlug(((OrgSlug) org).getSlug()).body().getId());
+                    } catch (NullPointerException noOrgFound) {
+                        err(String.format("The org '%s' is not found on JustServe", ((OrgSlug) org).getSlug()));
+                        return null;
+                    }
+                })
+                .filter(Objects::nonNull)
+                .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
+
         log.atTrace().log("Finished converting any slugs to org id's.");
         BoundaryPermissionClient boundaryPermissionClient = boundaryPermissionClientProvider.get();
         Map<Org, @Nullable UUID> successfulReassignments = new HashMap<>();

src/main/resources/logback.xml

@@ -8,7 +8,7 @@
         </encoder>
     </appender>
 
-    <root level="WARN">
+    <root level="OFF">
         <appender-ref ref="STDOUT" />
     </root>
 </configuration>