shortlink fixes and app properties

src/main/java/group/goforward/battlbuilder/config/ShortLinksProperties.java

@@ -11,13 +11,21 @@ public class ShortLinksProperties {
     private boolean enabled = true;
 
     /**
-     * The public base URL used when generating links (differs in dev vs prod).
+     * The public base URL used when generating short links (differs in dev vs prod).
      * Examples:
      *  - http://localhost:8080
      *  - https://bb.ooo
      */
     private String publicBaseUrl = "http://localhost:8080";
 
+    /**
+     * The frontend base URL used when redirecting BUILD short links.
+     * Examples:
+     *  - http://localhost:3000
+     *  - https://battlbuilder.com
+     */
+    private String frontendBaseUrl = "http://localhost:3000";
+
     public boolean isEnabled() {
         return enabled;
     }
@@ -33,4 +41,12 @@ public class ShortLinksProperties {
     public void setPublicBaseUrl(String publicBaseUrl) {
         this.publicBaseUrl = publicBaseUrl;
     }
+
+    public String getFrontendBaseUrl() {
+        return frontendBaseUrl;
+    }
+
+    public void setFrontendBaseUrl(String frontendBaseUrl) {
+        this.frontendBaseUrl = frontendBaseUrl;
+    }
 }

src/main/java/group/goforward/battlbuilder/controllers/ShortLinkRedirectController.java

@@ -1,6 +1,8 @@
 package group.goforward.battlbuilder.controllers;
 
+import group.goforward.battlbuilder.config.ShortLinksProperties;
 import group.goforward.battlbuilder.repos.ShortLinkRepository;
+
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -14,36 +16,64 @@ import java.net.URI;
 public class ShortLinkRedirectController {
 
     private final ShortLinkRepository repo;
+    private final ShortLinksProperties props;
 
-    public ShortLinkRedirectController(ShortLinkRepository repo) {
+    public ShortLinkRedirectController(ShortLinkRepository repo, ShortLinksProperties props) {
         this.repo = repo;
+        this.props = props;
     }
 
+    /**
+     * Single canonical short-link entry point.
+     *
+     * We intentionally keep ONE route (/go/{code}) for all short links
+     * (BUY affiliate redirects + BUILD share links) to avoid duplicated controllers
+     * and ambiguous Spring mappings.
+     *
+     * BUY  -> redirect to destination_url (stored from offer.buy_url / AvantLink)
+     * BUILD-> redirect to frontendBaseUrl + /builds/{buildUuid}
+     */
     @GetMapping("/go/{code}")
     public ResponseEntity<Void> go(@PathVariable String code) {
+
+        // Lookup only active links; 404 for missing/disabled
         var link = repo.findByCodeAndIsActiveTrue(code)
                 .orElseThrow(() -> new ResponseStatusException(HttpStatus.NOT_FOUND));
 
-        String dest;
+        final String dest;
 
+        // ----------------------------
+        // BUY: redirect to affiliate URL
+        // ----------------------------
         if ("BUY".equalsIgnoreCase(link.getType())) {
-            dest = link.getDestinationUrl();
+            String url = link.getDestinationUrl();
-            if (dest == null || dest.isBlank()) {
+            if (url == null || url.isBlank()) throw new ResponseStatusException(HttpStatus.NOT_FOUND);
-                throw new ResponseStatusException(HttpStatus.NOT_FOUND);
+            dest = url;
-            }
 
+            // ----------------------------
+            // BUILD: redirect to Next.js build page
+            // ----------------------------
         } else if ("BUILD".equalsIgnoreCase(link.getType())) {
-            if (link.getBuildUuid() == null) {
+            if (link.getBuildUuid() == null) throw new ResponseStatusException(HttpStatus.NOT_FOUND);
-                throw new ResponseStatusException(HttpStatus.NOT_FOUND);
-            }
 
-            // ✅ Adjust to your actual frontend route + base URL if needed (dev vs prod)
+            // Use env-specific frontend host (dev vs prod)
-            dest = "/builds/" + link.getBuildUuid();
+            String base = props.getFrontendBaseUrl();
+            if (base == null || base.isBlank()) throw new ResponseStatusException(HttpStatus.NOT_FOUND);
 
+            // Normalize trailing slash so we don't end up with //builds/...
+            base = base.endsWith("/") ? base.substring(0, base.length() - 1) : base;
+
+            // NOTE: Adjust path if your Next.js route changes
+            dest = base + "/builds/" + link.getBuildUuid();
+
+            // ----------------------------
+            // Unknown type: treat as missing
+            // ----------------------------
         } else {
             throw new ResponseStatusException(HttpStatus.NOT_FOUND);
         }
 
+        // 302 (FOUND) redirect
         return ResponseEntity.status(HttpStatus.FOUND)
                 .location(URI.create(dest))
                 .build();

src/main/resources/application-dev.yml

@@ -1,3 +1,4 @@
 shortlinks:
   enabled: true
-  publicBaseUrl: "http://localhost:8080"
+  publicBaseUrl: http://localhost:8080
+  frontendBaseUrl: http://localhost:3000

src/main/resources/application-prod.yml

@@ -1,3 +1,5 @@
-shortlinks:
+
+  shortlinks:
     enabled: true
-  publicBaseUrl: "https://battl.build"
+    publicBaseUrl: https://battl.build
+    frontendBaseUrl: https://battlbuilders.com