From 4ee741d307a233851f0bdc05af6d2445c74b9615 Mon Sep 17 00:00:00 2001
From: siujamo <jamo.siu@gmail.com>
Date: Mon, 1 Jun 2026 16:34:37 +0800
Subject: [PATCH] feat: add firearm name lookup for webhook YAML parsing

When firearmId is absent from the YAML block, resolveFirearmId falls back
to firearmName lookup via FirearmRepository.findByName(). If both are
present, firearmId takes precedence.
---
 .../manager/ModificationManager.java              | 15 +++++++++++++++
 .../repository/FirearmRepository.java             |  4 ++++
 .../deltaforceguide/service/WebhookService.java   |  4 +++-
 3 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/onixbyte/deltaforceguide/manager/ModificationManager.java b/src/main/java/com/onixbyte/deltaforceguide/manager/ModificationManager.java
index eb0007a..f7defab 100644
--- a/src/main/java/com/onixbyte/deltaforceguide/manager/ModificationManager.java
+++ b/src/main/java/com/onixbyte/deltaforceguide/manager/ModificationManager.java
@@ -71,6 +71,21 @@ public class ModificationManager {
                 .toList();
     }
 
+    public Long resolveFirearmId(Long firearmId, String firearmName) {
+        if (firearmId != null) {
+            return firearmId;
+        }
+        if (firearmName == null || firearmName.isBlank()) {
+            return null;
+        }
+        var matches = firearmRepository.findByName(firearmName);
+        if (matches.isEmpty()) {
+            throw new ResponseStatusException(HttpStatus.NOT_FOUND,
+                    "Firearm not found by name: " + firearmName);
+        }
+        return matches.getFirst().getId();
+    }
+
     private Modification toEntity(ModificationRequest request, Firearm firearm) {
         return Modification.builder()
                 .firearm(firearm)
diff --git a/src/main/java/com/onixbyte/deltaforceguide/repository/FirearmRepository.java b/src/main/java/com/onixbyte/deltaforceguide/repository/FirearmRepository.java
index dcf85f8..b486703 100644
--- a/src/main/java/com/onixbyte/deltaforceguide/repository/FirearmRepository.java
+++ b/src/main/java/com/onixbyte/deltaforceguide/repository/FirearmRepository.java
@@ -7,9 +7,13 @@ import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 
+import java.util.List;
+
 @Repository
 public interface FirearmRepository extends JpaRepository<Firearm, Long> {
 
 	Page<Firearm> findAllByType(FirearmType type, Pageable pageable);
+
+	List<Firearm> findByName(String name);
 }
 
diff --git a/src/main/java/com/onixbyte/deltaforceguide/service/WebhookService.java b/src/main/java/com/onixbyte/deltaforceguide/service/WebhookService.java
index f54f39c..91f454b 100644
--- a/src/main/java/com/onixbyte/deltaforceguide/service/WebhookService.java
+++ b/src/main/java/com/onixbyte/deltaforceguide/service/WebhookService.java
@@ -109,7 +109,9 @@ public class WebhookService {
     }
 
     private ModificationRequest mapToRequest(Map<String, Object> data) {
-        Long firearmId = toLong(data.get("firearmId"));
+        Long firearmId = modificationManager.resolveFirearmId(
+                toLong(data.get("firearmId")),
+                (String) data.get("firearmName"));
         String name = (String) data.get("name");
         String code = (String) data.get("code");
         List<String> tags = toStringList(data.get("tags"));