Skip to content

fix: allows MMSI null values on update #364

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
hav-johwal wants to merge 1 commit into
base: develop
Choose a base branch
from
+2 −3
Open

fix: allows MMSI null values on update #364

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion module/src/main/java/fish/focus/uvms/asset/bean/AssetServiceBean.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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());
}
Expand Down
4 changes: 2 additions & 2 deletions module/src/test/java/fish/focus/uvms/rest/asset/service/InternalRestResourceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand All @@ -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
Expand Down