From 5dc90a634bedb5104cd75dcb97992d4baa06e106 Mon Sep 17 00:00:00 2001
From: Jake Potrebic <jake.m.potrebic@gmail.com>
Date: Thu, 3 Sep 2020 19:14:18 -0700
Subject: [PATCH] channel creation on version upload

---
 .../hangar/controller/VersionsController.java | 30 ++++++++++++++++---
 .../service/project/ProjectFactory.java       |  3 --
 2 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/src/main/java/io/papermc/hangar/controller/VersionsController.java b/src/main/java/io/papermc/hangar/controller/VersionsController.java
index 0515fea77..32a917f41 100644
--- a/src/main/java/io/papermc/hangar/controller/VersionsController.java
+++ b/src/main/java/io/papermc/hangar/controller/VersionsController.java
@@ -24,6 +24,8 @@ import org.springframework.web.servlet.view.RedirectView;
 
 import java.nio.file.Path;
 import java.time.OffsetDateTime;
+import java.util.List;
+import java.util.Optional;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
@@ -267,9 +269,31 @@ public class VersionsController extends HangarController {
             return new ModelAndView("redirect:" + routeHelper.getRouteUrl("versions.showCreator", author, slug));
         }
 
+        List<ProjectChannelsTable> projectChannels = channelService.getProjectChannels(projectData.getProject().getId());
+        String alertMsg = null;
+        String[] alertArgs = new String[0];
+        Optional<ProjectChannelsTable> channelOptional = projectChannels.stream().filter(ch -> ch.getName().equals(channelInput.trim())).findAny();
+        ProjectChannelsTable channel;
+        if (channelOptional.isEmpty()) {
+            if (projectChannels.size() >= hangarConfig.projects.getMaxChannels()) {
+                alertMsg = "error.channel.maxChannels";
+                alertArgs = new String[] {String.valueOf(hangarConfig.projects.getMaxChannels())};
+            }
+            else if (projectChannels.stream().anyMatch(ch -> ch.getColor() == channelColor)) {
+                alertMsg = "error.channel.duplicateColor";
+            }
+            if (alertMsg != null) {
+                AlertUtil.showAlert(attributes, AlertUtil.AlertType.ERROR, alertMsg, alertArgs);
+                return new ModelAndView("redirect:" + routeHelper.getRouteUrl("versions.showCreator", author, slug));
+            }
+            channel = channelService.addProjectChannel(projectData.getProject().getId(), channelInput.trim(), channelColor);
+        } else {
+            channel = channelOptional.get();
+        }
+
         PendingVersion newPendingVersion = pendingVersion.copy(
-                channelInput.trim(),
-                channelColor,
+                channel.getName(),
+                channel.getColor(),
                 forumPost,
                 content
         );
@@ -279,10 +303,8 @@ public class VersionsController extends HangarController {
             return new ModelAndView("redirect:" + routeHelper.getRouteUrl("versions.showCreator", author, slug));
         }
 
-        ProjectChannelsTable channel = channelService.getProjectChannel(projectData.getProject().getId(), channelInput);
         ProjectVersionsTable version;
         try {
-            if (channel == null) throw new HangarException("error.channel.invalidName", channelInput);
             version = newPendingVersion.complete(request, projectData, projectFactory);
         } catch (HangarException e) {
             AlertUtil.showAlert(attributes, AlertUtil.AlertType.ERROR, e.getMessage(), e.getArgs());
diff --git a/src/main/java/io/papermc/hangar/service/project/ProjectFactory.java b/src/main/java/io/papermc/hangar/service/project/ProjectFactory.java
index 2ac3fa940..a3aa54ec1 100644
--- a/src/main/java/io/papermc/hangar/service/project/ProjectFactory.java
+++ b/src/main/java/io/papermc/hangar/service/project/ProjectFactory.java
@@ -145,9 +145,6 @@ public class ProjectFactory {
     public ProjectVersionsTable createVersion(HttpServletRequest request, ProjectData project, PendingVersion pendingVersion) {
 
         ProjectChannelsTable channel = projectChannelDao.get().getProjectChannel(project.getProject().getId(), pendingVersion.getChannelName(), null);
-        if (channel == null) {
-            channel = channelService.addProjectChannel(project.getProject().getId(), pendingVersion.getChannelName(), pendingVersion.getChannelColor());
-        }
 
         if (versionService.exists(pendingVersion) && hangarConfig.projects.isFileValidate()) {
             throw new HangarException("error.version.duplicate");