Changeset 34950c6 for phonelux-backend/src/main/java/finki/it/phoneluxbackend/services/PhoneOfferService.java

Timestamp:

09/22/22 03:14:04 (2 years ago)

Author:

Marko <Marko@…>

Branches:

master

Children:

436e0da

Parents:

d66b8eb

Message:

Specification filters logic implemented

File:

• phonelux-backend/src/main/java/finki/it/phoneluxbackend/services/PhoneOfferService.java (modified) (3 diffs)

phonelux-backend/src/main/java/finki/it/phoneluxbackend/services/PhoneOfferService.java

@@ -231 +231 @@
                 .map(cpu -> cpu.split("\n")[0].stripIndent().replaceAll("\n",""))
                 .filter(cpu -> !cpu.contains("Snapdragon") && !cpu.contains("Exynos"))
+                .filter(cpu -> Character.isAlphabetic(cpu.charAt(0)))
                 .distinct()
                 .sorted()
@@ -252 +253 @@
         List<PhoneOffer> offers = phoneOfferRepository.findAll();
 
-        return offers.stream()
+        List<String> cameras = offers.stream()
                 .map(PhoneOffer::getBack_camera)
                 .filter(camera -> camera != null && !camera.equals("") && !camera.equals("/"))
                 .map(camera -> camera.split("[\n,]")[0].replaceAll("\t",""))
-                .distinct()
-                .sorted()
-                .collect(Collectors.toList());
+                .flatMap(camera -> Arrays.stream(camera.split("[+/]")))
+                .map(camera -> camera.replaceAll("MP","").stripIndent())
+                .distinct()
+                .sorted()
+                .collect(Collectors.toList());
+
+        cameras.stream()
+                .forEach(camera -> {
+                    if(Character.isDigit(camera.charAt(0)))
+                    cameras.set(cameras.indexOf(camera), camera+"MP");
+
+                });
+
+        return cameras;
     }
 
@@ -267 +279 @@
                 .map(PhoneOffer::getBattery)
                 .filter(battery -> battery != null && !battery.equals("") && !battery.equals("/"))
-                .map(battery -> battery.split(",")[0].stripIndent())
+                .map(battery -> battery.split(",")[0]
+                        .split("\n")[0]
+                        .replaceAll("'","")
+                        .replaceAll("\t"," ")
+                        .stripIndent())
+                .map(battery -> battery.replaceAll("battery", "").stripIndent())
                 .distinct()
                 .sorted(Comparator.reverseOrder())