From 0e8ec5c1de50c902af6faa26b68242012f37b518 Mon Sep 17 00:00:00 2001
From: hav-johwal <166103136+hav-johwal@users.noreply.github.com>
Date: Thu, 30 Oct 2025 17:01:17 +0100
Subject: [PATCH] fix: allows MMSI null values on update

Removing MMSI from a vessel is impossible without manual intervention.
---
 .../java/fish/focus/uvms/asset/bean/AssetServiceBean.java     | 1 -
 .../uvms/rest/asset/service/InternalRestResourceTest.java     | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/module/src/main/java/fish/focus/uvms/asset/bean/AssetServiceBean.java b/module/src/main/java/fish/focus/uvms/asset/bean/AssetServiceBean.java
index 9810bad1..3bd7153f 100755
--- a/module/src/main/java/fish/focus/uvms/asset/bean/AssetServiceBean.java
+++ b/module/src/main/java/fish/focus/uvms/asset/bean/AssetServiceBean.java
@@ -245,7 +245,6 @@ public AssetBO upsertAssetBO(AssetBO assetBo, String username) {
             asset.setId(existingAsset.getId());
 
             // to save values we already have and don't get from the external source
-            asset.setMmsi(asset.getMmsi() == null ? existingAsset.getMmsi() : asset.getMmsi());
             asset.setComment(asset.getComment() == null ? existingAsset.getComment() : asset.getComment());
             asset.setParked(asset.getParked() == null ? existingAsset.getParked() : asset.getParked());
         }
diff --git a/module/src/test/java/fish/focus/uvms/rest/asset/service/InternalRestResourceTest.java b/module/src/test/java/fish/focus/uvms/rest/asset/service/InternalRestResourceTest.java
index ed2223a0..b6d373a6 100755
--- a/module/src/test/java/fish/focus/uvms/rest/asset/service/InternalRestResourceTest.java
+++ b/module/src/test/java/fish/focus/uvms/rest/asset/service/InternalRestResourceTest.java
@@ -226,7 +226,7 @@ public void upsertAssetTest() {
 
     @Test
     @OperateOnDeployment("normal")
-    public void updateAssetRetainMMSIAndCommentTest() {
+    public void updateAssetRetainCommentTest() {
         Asset asset = AssetHelper.createBasicAsset();
         asset.setComment("Update Asset Retain Comment");
         AssetBO assetBo = new AssetBO();
@@ -253,7 +253,7 @@ public void updateAssetRetainMMSIAndCommentTest() {
 
         assertThat(updatedAsset, is(notNullValue()));
         assertThat(updatedAsset.getAsset().getComment(), is(asset.getComment()));
-        assertThat(updatedAsset.getAsset().getMmsi(), is(asset.getMmsi()));
+        assertThat(updatedAsset.getAsset().getMmsi(), is(nullValue()));
     }
 
     @Test