Merge pull request #1096 from bounswe/main

deploying last changes

app/annotation/annotation/Dockerfile

@@ -1,6 +1,6 @@
-FROM eclipse-temurin:17-jdk-alpine
-WORKDIR /app
-VOLUME /app/images
-COPY target/*.jar /app/bounswe.jar
+FROM maven:3.9.6-eclipse-temurin-21-jammy
+WORKDIR /app/annotation
+COPY . /app/annotation
+RUN mvn clean install
 EXPOSE 8080
-ENTRYPOINT ["java","-jar","/app/bounswe.jar"]
+ENTRYPOINT ["java","-jar","/app/annotation/target/annotation-1.0-SNAPSHOT.jar"]

app/annotation/annotation/pom.xml

@@ -79,4 +79,13 @@
         </dependency>
     </dependencies>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
+
 </project>

app/annotation/annotation/src/main/java/com/app/annotation/controller/AnnotationController.java

@@ -50,4 +50,13 @@ public ResponseEntity<List<Map<String, Object>>> getAnnotation(@RequestParam Str
         }
         return ResponseEntity.ok(annotations);
     }
+
+    @GetMapping("/get-image-annotations")
+    public ResponseEntity<List<Map<String, Object>>> getImageAnnotations(@RequestParam String source) {
+        List<Map<String, Object>> annotations = annotationService.getImageAnnotations(source);
+        if(annotations == null || annotations.isEmpty()) {
+            return ResponseEntity.notFound().build();
+        }
+        return ResponseEntity.ok(annotations);
+    }
 }

app/annotation/annotation/src/main/java/com/app/annotation/controller/CustomExceptionHandler.java

@@ -0,0 +1,34 @@
+package com.app.annotation.controller;
+
+import com.app.annotation.exception.BadRequestException;
+import com.app.annotation.exception.ResourceNotFoundException;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.MethodArgumentNotValidException;
+import org.springframework.web.bind.annotation.ControllerAdvice;
+import org.springframework.web.bind.annotation.ExceptionHandler;
+import org.springframework.web.bind.annotation.ResponseStatus;
+
+@ControllerAdvice
+public class CustomExceptionHandler {
+    @ExceptionHandler(ResourceNotFoundException.class)
+    @ResponseStatus(HttpStatus.BAD_REQUEST)
+    public ResponseEntity<Object> handleResourceNotFoundException(ResourceNotFoundException ex) {
+        return ResponseEntity.status(HttpStatus.NOT_FOUND).body(ex.getMessage());
+    }
+
+    @ExceptionHandler(BadRequestException.class)
+    @ResponseStatus(HttpStatus.BAD_REQUEST)
+    public ResponseEntity<Object> handleBadRequestException(BadRequestException ex) {
+        return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(ex.getMessage());
+    }
+
+    @ExceptionHandler(MethodArgumentNotValidException.class)
+    @ResponseStatus(HttpStatus.BAD_REQUEST)
+    public ResponseEntity<String> handleValidationException(MethodArgumentNotValidException ex) {
+        String defaultMessage = ex.getBindingResult()
+                .getFieldError()
+                .getDefaultMessage();
+        return ResponseEntity.badRequest().body(defaultMessage);
+    }
+}

app/annotation/annotation/src/main/java/com/app/annotation/dto/request/SelectorDto.java

@@ -27,4 +27,9 @@ public class SelectorDto {
 
     @Positive
     private Integer end;
+
+    private String value;
+
+    @Pattern(regexp = "^(https?|ftp)://[^\\s/$.?#].\\S*$", message = "Invalid URL")
+    private String conformsTo;
 }

app/annotation/annotation/src/main/java/com/app/annotation/dto/request/TargetDto.java

@@ -1,11 +1,16 @@
 package com.app.annotation.dto.request;
 
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonSetter;
 import jakarta.validation.constraints.NotEmpty;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.LinkedHashMap;
 import java.util.List;
 @Data
 @AllArgsConstructor
@@ -24,5 +29,46 @@ public class TargetDto {
     private String source;
 
     @NotEmpty(message = "target selector can not be empty.")
+    @JsonIgnore
     private List<SelectorDto> selector;
+
+    @JsonSetter("selector")
+    public void setSelector(Object selector) {
+        if (selector instanceof List) {
+            List<LinkedHashMap<String, Object>> hashList;
+            hashList = (List<LinkedHashMap<String, Object>>) selector;
+            this.selector = mapToSelectorDtoList(hashList);
+        } else {
+            LinkedHashMap<String, Object> hash = (LinkedHashMap<String, Object>) selector;
+            this.selector = Collections.singletonList(convertToSelectorDto(hash));
+        }
+    }
+
+    public static List<SelectorDto> mapToSelectorDtoList(List<LinkedHashMap<String, Object>> inputList) {
+        List<SelectorDto> resultList = new ArrayList<>();
+
+        if (inputList != null) {
+            for (LinkedHashMap<String, Object> map : inputList) {
+                SelectorDto selectorDto = convertToSelectorDto(map);
+                resultList.add(selectorDto);
+            }
+        }
+
+        return resultList;
+    }
+
+    private static SelectorDto convertToSelectorDto(LinkedHashMap<String, Object> map) {
+        SelectorDto selectorDto = new SelectorDto();
+        selectorDto.setType((String) map.get("type"));
+        selectorDto.setExact((String) map.get("exact"));
+        selectorDto.setPrefix((String) map.get("prefix"));
+        selectorDto.setSuffix((String) map.get("suffix"));
+        selectorDto.setStart((Integer) map.get("start"));
+        selectorDto.setEnd((Integer) map.get("end"));
+        selectorDto.setValue((String) map.get("value"));
+        selectorDto.setConformsTo((String) map.get("conformsTo"));
+        // Add other fields as needed
+
+        return selectorDto;
+    }
 }

app/annotation/annotation/src/main/java/com/app/annotation/exception/BadRequestException.java

@@ -0,0 +1,7 @@
+package com.app.annotation.exception;
+
+public class BadRequestException extends RuntimeException {
+    public BadRequestException(String message) {
+        super(message);
+    }
+}

app/annotation/annotation/src/main/java/com/app/annotation/exception/ResourceNotFoundException.java

@@ -0,0 +1,7 @@
+package com.app.annotation.exception;
+
+public class ResourceNotFoundException extends RuntimeException {
+    public ResourceNotFoundException(String message) {
+        super(message);
+    }
+}

app/annotation/annotation/src/main/java/com/app/annotation/model/FragmentSelector.java

@@ -0,0 +1,27 @@
+package com.app.annotation.model;
+
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+import java.util.HashMap;
+import java.util.Map;
+
+@NoArgsConstructor
+@Getter
+@Setter
+public class FragmentSelector extends Selector {
+
+    private String value;
+
+    private String conformsTo;
+
+    @Override
+    public Map<String, Object> toJSON() {
+        Map<String, Object> json = new HashMap<>();
+        if  (this.type != null) json.put("type", this.type);
+        if  (this.value != null) json.put("value", this.value);
+        if  (this.conformsTo != null) json.put("conformsTo", this.conformsTo);
+        return json;
+    }
+}

app/annotation/annotation/src/main/java/com/app/annotation/model/Target.java

@@ -32,13 +32,17 @@ public Map<String, Object> toJSON() {
         if  (this.format != null) json.put("format", this.format);
         if  (this.textDirection != null) json.put("textDirection", this.textDirection);
         if  (this.source != null) json.put("source", this.source);
-        if  (this.selector != null) {
-            List<Map<String, Object>> selectorList = new ArrayList<>();
-
-            for (Selector s : this.selector) {
-                selectorList.add(s.toJSON());
+        if  (this.selector != null && !this.selector.isEmpty()) {
+            if (this.selector.size() > 1) {
+                List<Map<String, Object>> selectorList = new ArrayList<>();
+
+                for (Selector s : this.selector) {
+                    selectorList.add(s.toJSON());
+                }
+                json.put("selector", selectorList);
+            } else {
+                json.put("selector", this.selector.get(0).toJSON());
             }
-            json.put("selector", selectorList);
         }
         return json;
     }

app/annotation/annotation/src/main/java/com/app/annotation/service/AnnotationService.java

@@ -2,6 +2,7 @@
 
 import com.app.annotation.dto.request.SelectorDto;
 import com.app.annotation.dto.request.TargetDto;
+import com.app.annotation.exception.BadRequestException;
 import com.app.annotation.model.*;
 import com.app.annotation.repository.AnnotationRepository;
 import com.app.annotation.dto.request.CreateAnnotationRequestDto;
@@ -36,22 +37,20 @@ protected void configure() {
 
     public Map<String, Object> createAnnotation(CreateAnnotationRequestDto dto) {
 
+        Optional<Annotation> prevAnnotation = annotationRepository.findById(dto.getId());
+
+        if (prevAnnotation.isPresent()) {
+            throw new BadRequestException("There is an annotation with same id.");
+        }
+
         Annotation annotationToCreate = modelMapper.map(dto, Annotation.class);
 
         List<Selector> selectorList = new ArrayList<>();
         for (SelectorDto s : dto.getTarget().getSelector()) {
-            if (s.getExact() != null) {
-                System.out.println(s.getType());
-                System.out.println(s.getExact());
-            }
-            if (s.getStart() != null) {
-                System.out.println(s.getType());
-                System.out.println(s.getStart());
-            }
-            if (s.getType().equals("TextQuoteSelector")) {
-                selectorList.add(modelMapper.map(s, TextQuoteSelector.class));
-            } else if (s.getType().equals("TextPositionSelector")) {
-                selectorList.add(modelMapper.map(s, TextPositionSelector.class));
+            switch (s.getType()) {
+                case "TextQuoteSelector" -> selectorList.add(modelMapper.map(s, TextQuoteSelector.class));
+                case "TextPositionSelector" -> selectorList.add(modelMapper.map(s, TextPositionSelector.class));
+                case "FragmentSelector" -> selectorList.add(modelMapper.map(s, FragmentSelector.class));
             }
             //TODO add more selectors if implemented in the future
         }
@@ -101,8 +100,39 @@ public List<Map<String, Object>> getAnnotations(String source) {
         List<Annotation> annotations = annotationRepository.findAllByTargetSource(source);
         List<Map<String, Object>> jsonAnnotations = new ArrayList<>();
         for (Annotation a : annotations) {
+
+            List<Selector> selectors = a.getTarget().getSelector();
+
+            boolean haveTextSelectors = true;
+
+            for (Selector s : selectors) {
+                if (!s.getType().equals("TextQuoteSelector") && !s.getType().equals("TextPositionSelector")) {
+                    haveTextSelectors = false;
+                    break;
+                }
+
+                // TODO change logic as more selectors are implemented in the future
+            }
+
+            if (!haveTextSelectors) {
+                continue;
+            }
+
             jsonAnnotations.add(a.toJSON());
         }
         return jsonAnnotations;
     }
+
+    public List<Map<String, Object>> getImageAnnotations(String source) {
+        List<Annotation> annotations = annotationRepository.findAllByTargetSource(source);
+        List<Map<String, Object>> jsonAnnotations = new ArrayList<>();
+        for (Annotation a : annotations) {
+
+            if (a.getTarget().getSelector().size() == 1 && a.getTarget().getSelector().get(0).getType().equals("FragmentSelector")) {
+                jsonAnnotations.add(a.toJSON());
+            }
+            // TODO change logic if more image selectors are implemented in the future
+        }
+        return jsonAnnotations;
+    }
 }

app/backend/.dockerignore

@@ -0,0 +1,5 @@
+target
+images
+README.md
+format.sh
+.gitignore

app/backend/.gitignore

@@ -36,4 +36,5 @@ build/
 *.env
 
 ### Image Files
-/images/
+images/*
+!images/README.md

app/backend/Dockerfile

@@ -1,6 +1,7 @@
-FROM eclipse-temurin:17-jdk-alpine
-WORKDIR /app
-VOLUME /app/images
-COPY target/*.jar /app/bounswe.jar
+FROM maven:3.9.6-eclipse-temurin-21-jammy
+WORKDIR /app/backend
+VOLUME /app/backend/images
+COPY . /app/backend/
+RUN mvn clean install
 EXPOSE 8080
-ENTRYPOINT ["java","-jar","/app/bounswe.jar"]
+ENTRYPOINT ["java","-jar","/app/backend/target/gamereview-0.0.1-SNAPSHOT.jar"]

app/backend/images/README.md

@@ -0,0 +1 @@
+This directory is where the application stores its images, when it is run locally.

app/backend/pom.xml

@@ -104,6 +104,25 @@
 				<artifactId>spring-javaformat-maven-plugin</artifactId>
 				<version>0.0.39</version>
 			</plugin>
+			<plugin>
+				<groupId>org.jacoco</groupId>
+				<artifactId>jacoco-maven-plugin</artifactId>
+				<version>0.8.11</version>
+				<executions>
+					<execution>
+						<goals>
+							<goal>prepare-agent</goal>
+						</goals>
+					</execution>
+					<execution>
+						<id>generate-code-coverage-report</id>
+						<phase>test</phase>
+						<goals>
+							<goal>report</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
 		</plugins>
 	</build>
 

app/backend/src/main/java/com/app/gamereview/config/CorsConfig.java

@@ -15,7 +15,7 @@ public class CorsConfig {
     @Bean
     public CorsConfigurationSource corsConfigurationSource() {
         final CorsConfiguration configuration = new CorsConfiguration();
-        configuration.setAllowedOrigins(Arrays.asList("http://localhost:5173", "http://ec2-51-20-78-40.eu-north-1.compute.amazonaws.com/"));
+        configuration.setAllowedOrigins(Arrays.asList("http://localhost:5173", "http://localhost", "http://ec2-51-20-78-40.eu-north-1.compute.amazonaws.com/"));
         configuration.setAllowedMethods(Arrays.asList("GET", "POST", "PUT", "DELETE", "OPTIONS"));
         configuration.setAllowCredentials(true);
         configuration.setAllowedHeaders(Arrays.asList("Authorization", "Content-Type", "Set-Cookie", "credentials"));

app/backend/src/main/java/com/app/gamereview/controller/GroupController.java

@@ -22,6 +22,7 @@
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
+import java.util.Optional;
 
 @RestController
 @RequestMapping("/api/group")
@@ -184,11 +185,16 @@ public ResponseEntity<List<GroupApplicationResponseDto>> listApplications(@Reque
         return ResponseEntity.ok(applications);
     }
 
-    @AuthorizationRequired
     @GetMapping("/get-recommendations")
-    public ResponseEntity<List<Group>> getRecommendedGroups(@RequestHeader String Authorization, HttpServletRequest request) {
-        User user = (User) request.getAttribute("authenticatedUser");
-        List<Group> groups = groupService.getRecommendedGroups(user);
+    public ResponseEntity<List<Group>> getRecommendedGroups(@RequestHeader(name = HttpHeaders.AUTHORIZATION,
+            required = false) String Authorization) {
+        String email = "";
+        if(Authorization == null){
+            return ResponseEntity.ok(groupService.getRecommendedGroups(email));
+        }
+        if (JwtUtil.validateToken(Authorization))
+            email = JwtUtil.extractSubject(Authorization);
+        List<Group> groups = groupService.getRecommendedGroups(email);
         return ResponseEntity.ok(groups);
     }
 }