Merge pull request #9 from PharmEasyEngg/fix/comp-error

error
PharmEasyEngg · Dec 23, 2022 · d436c00 · d436c00
2 parents 9e9e3d7 + 6e882a7
commit d436c00
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 61 deletions.
diff --git a/master/src/main/java/com/lampo/device_lab/master/controller/HomeController.java b/master/src/main/java/com/lampo/device_lab/master/controller/HomeController.java
@@ -35,6 +35,7 @@
 import com.lampo.device_lab.master.model.DeviceStatusModel;
 import com.lampo.device_lab.master.model.HeldBy;
 import com.lampo.device_lab.master.model.ModelDevice;
+import com.lampo.device_lab.master.model.Photo;
 import com.lampo.device_lab.master.repos.IDeviceRepository;
 import com.lampo.device_lab.master.repos.IDeviceStatusRepository;
 import com.lampo.device_lab.master.repos.ITeamRepository;
@@ -217,7 +218,8 @@ private String getDeviceType(@NonNull Device device) {
 	private String getPhoneImage(@NonNull Device device) {
 		String name = (device.getDeviceInformation().isAndroid() ? device.getDeviceInformation().getMarketName()
 				: device.getDeviceInformation().getModel()).replaceAll("[\\(\\)]", " ");
-		return phoneImageService.getPhotoByName(name).stream().findFirst().orElseGet(() -> "default");
+		return phoneImageService.getPhotoByName(name).stream().map(Photo::getName).findFirst()
+				.orElseGet(() -> "default");
 	}
 
 	private String getUrl(@NonNull Device device, String clientIp) {
@@ -286,4 +288,4 @@ private String getDisplayName(@NonNull Device device) {
 				.collect(Collectors.toList());
 	}
 
-}
+}
diff --git a/master/src/main/java/com/lampo/device_lab/master/repos/IUsersRepository.java b/master/src/main/java/com/lampo/device_lab/master/repos/IUsersRepository.java