Merge pull request #111 from volodymyrlp/dev

Release: tags, participants and trip photos

Author: volodymyrlp

.gitignore

@@ -17,3 +17,6 @@ dist/
 .vscode/
 *.iml
 .DS_Store
+
+# --- foglamp scan (edit token is a secret) ---
+.foglamp/

README.md

@@ -34,6 +34,10 @@ the two free-tier traps that already broke a release, live in [docs/DEPLOY.md](d
 /frontend   — React + Vite SPA
 ```
 
+An interactive map of the architecture — the modules, the services they talk to and how the
+pieces connect — is published at <https://foglamp.dev/scan/mriyatrip-lplqrt>. It is an unlisted
+link and it expires on 27 November 2026.
+
 ## Local development
 1. Copy `.env.example` → `.env` and fill in the values. Optional for a first run —
    compose falls back to local defaults for everything except `ORS_API_KEY`.

backend/pom.xml

@@ -110,6 +110,11 @@
 			<artifactId>spring-boot-starter-test</artifactId>
 			<scope>test</scope>
 		</dependency>
+		<dependency>
+			<groupId>org.springframework.security</groupId>
+			<artifactId>spring-security-test</artifactId>
+			<scope>test</scope>
+		</dependency>
 	</dependencies>
 
 	<build>

backend/src/main/java/travelplanner/config/SecurityConfig.java

@@ -67,7 +67,8 @@ public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Excepti
                                         "/api/v1/auth/**",
                                         "/api/v1/landing/**",
                                         "/api/v1/trips/catalog",
-                                        "/error"
+                                        "/error",
+                                        "/uploads/**"
                                 )
                                 .permitAll()
                                 .anyRequest()

backend/src/main/java/travelplanner/config/WebConfig.java

@@ -0,0 +1,27 @@
+package travelplanner.config;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+
+@Configuration
+public class WebConfig implements WebMvcConfigurer {
+
+    @Override
+    public void addResourceHandlers(ResourceHandlerRegistry registry) {
+        Path uploadDir = Paths.get("uploads").toAbsolutePath().normalize();
+
+        try {
+            Files.createDirectories(uploadDir);
+        } catch (IOException e) {
+            throw new RuntimeException("Could not create uploads directory", e);
+        }
+
+        registry.addResourceHandler("/uploads/**")
+                .addResourceLocations("file:" + uploadDir.toString() + "/");
+    }
+}

backend/src/main/java/travelplanner/controller/TripController.java

@@ -1,12 +1,14 @@
 package travelplanner.controller;
 
 import jakarta.validation.Valid;
+import java.util.List;
 import java.util.UUID;
 import lombok.RequiredArgsConstructor;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.web.PageableDefault;
 import org.springframework.http.HttpStatus;
+import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.core.annotation.AuthenticationPrincipal;
 import org.springframework.web.bind.annotation.DeleteMapping;
@@ -18,6 +20,8 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
+import travelplanner.dto.trip.PhotoResponse;
 import travelplanner.dto.trip.TripCreateRequest;
 import travelplanner.dto.trip.TripResponse;
 import travelplanner.entity.User;
@@ -70,6 +74,32 @@ public ResponseEntity<Void> deleteTrip(@PathVariable UUID tripId) {
         return ResponseEntity.noContent().build();
     }
 
+    @PostMapping(value = "/{tripId}/cover", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
+    public ResponseEntity<TripResponse> updateTripCover(
+            @PathVariable UUID tripId,
+            @RequestParam("file") MultipartFile file,
+            @AuthenticationPrincipal User currentUser
+    ) {
+        TripResponse response = tripService.updateTripCover(tripId, file, currentUser);
+        return ResponseEntity.ok(response);
+    }
+
+    @PostMapping(value = "/{tripId}/photos", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
+    public ResponseEntity<PhotoResponse> uploadTripPhoto(
+            @PathVariable UUID tripId,
+            @RequestParam("file") MultipartFile file,
+            @AuthenticationPrincipal User currentUser
+    ) {
+        PhotoResponse response = tripService.uploadTripPhoto(tripId, file, currentUser);
+        return ResponseEntity.ok(response);
+    }
+
+    @GetMapping("/{tripId}/photos")
+    public ResponseEntity<List<PhotoResponse>> getTripPhotos(@PathVariable UUID tripId) {
+        List<PhotoResponse> response = tripService.getTripPhotos(tripId);
+        return ResponseEntity.ok(response);
+    }
+
     @ExceptionHandler(EntityNotFoundException.class)
     public ResponseEntity<String> handleNotFound(EntityNotFoundException ex) {
         return ResponseEntity.status(HttpStatus.NOT_FOUND).body(ex.getMessage());

backend/src/main/java/travelplanner/dto/trip/PhotoResponse.java

@@ -0,0 +1,11 @@
+package travelplanner.dto.trip;
+
+import java.time.LocalDateTime;
+import java.util.UUID;
+
+public record PhotoResponse(
+        UUID photoId,
+        String url,
+        UUID uploaderId,
+        LocalDateTime createdAt
+) {}

backend/src/main/java/travelplanner/entity/Photo.java

@@ -0,0 +1,46 @@
+package travelplanner.entity;
+
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
+import java.time.LocalDateTime;
+import java.util.UUID;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import org.hibernate.annotations.JdbcTypeCode;
+import org.hibernate.type.SqlTypes;
+
+@Entity
+@Table(name = "photos")
+@Getter
+@Setter
+@NoArgsConstructor
+public class Photo {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.UUID)
+    @JdbcTypeCode(SqlTypes.VARCHAR)
+    @Column(name = "photo_id", columnDefinition = "VARCHAR(36)", nullable = false)
+    private UUID photoId;
+
+    @ManyToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "trip_id", nullable = false)
+    private Trip trip;
+
+    @ManyToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "uploader_id", nullable = false)
+    private User uploader;
+
+    @Column(name = "url", nullable = false)
+    private String url;
+
+    @Column(name = "created_at", insertable = false, updatable = false)
+    private LocalDateTime createdAt;
+}

backend/src/main/java/travelplanner/entity/Tag.java

@@ -0,0 +1,31 @@
+package travelplanner.entity;
+
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
+import java.util.UUID;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import org.hibernate.annotations.JdbcTypeCode;
+import org.hibernate.type.SqlTypes;
+
+@Entity
+@Table(name = "tags")
+@Getter
+@Setter
+@NoArgsConstructor
+public class Tag {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.UUID)
+    @JdbcTypeCode(SqlTypes.VARCHAR)
+    @Column(name = "tag_id", columnDefinition = "VARCHAR(36)", nullable = false)
+    private UUID tagId;
+
+    @Column(name = "name", nullable = false, unique = true)
+    private String name;
+}

backend/src/main/java/travelplanner/entity/Trip.java

@@ -8,13 +8,17 @@
 import jakarta.persistence.GenerationType;
 import jakarta.persistence.Id;
 import jakarta.persistence.JoinColumn;
+import jakarta.persistence.JoinTable;
+import jakarta.persistence.ManyToMany;
 import jakarta.persistence.ManyToOne;
 import jakarta.persistence.OneToMany;
 import jakarta.persistence.Table;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
 import java.util.UUID;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
@@ -62,4 +66,23 @@ public class Trip {
 
     @OneToMany(mappedBy = "trip", cascade = CascadeType.ALL, orphanRemoval = true)
     private List<TripDay> tripDays = new ArrayList<>();
+
+    @ManyToMany
+    @JoinTable(
+            name = "trip_tags",
+            joinColumns = @JoinColumn(name = "trip_id"),
+            inverseJoinColumns = @JoinColumn(name = "tag_id")
+    )
+    private Set<Tag> tags = new HashSet<>();
+
+    @ManyToMany
+    @JoinTable(
+            name = "trip_participants",
+            joinColumns = @JoinColumn(name = "trip_id"),
+            inverseJoinColumns = @JoinColumn(name = "user_id")
+    )
+    private Set<User> participants = new HashSet<>();
+
+    @OneToMany(mappedBy = "trip", cascade = CascadeType.ALL, orphanRemoval = true)
+    private List<Photo> photos = new ArrayList<>();
 }