Share GPX

db/sql_changeset_schema

@@ -43,26 +43,28 @@ CREATE INDEX user_files_deviceid_idx on user_files(deviceid);
 CREATE TABLE user_share_files (
     id SERIAL PRIMARY KEY,
     ownerid INTEGER NOT NULL,
-    uuid TEXT UNIQUE,
+    uuid UUID UNIQUE,
     filepath TEXT NOT NULL,
     name TEXT NOT NULL,
     type TEXT NOT NULL,
     public_access BOOLEAN NOT NULL
 );
 
 CREATE TABLE user_share_files_access (
-    id SERIAL PRIMARY KEY,
+    id SERIAL UNIQUE,
     user_id INTEGER NOT NULL,
     access TEXT NOT NULL,
     date TIMESTAMP NOT NULL,
     file_id INTEGER NOT NULL,
+    CONSTRAINT user_share_files_access_pk PRIMARY KEY (file_id, user_id),
     CONSTRAINT fk_user_share_files_access_user FOREIGN KEY (user_id) REFERENCES user_accounts(id) ON DELETE CASCADE,
     CONSTRAINT fk_user_share_files_access_file FOREIGN KEY (file_id) REFERENCES user_share_files(id) ON DELETE CASCADE
 );
 
 CREATE INDEX user_share_files_ownerid_idx ON user_share_files(ownerid);
 CREATE INDEX user_share_files_uuid_idx ON user_share_files(uuid);
 CREATE INDEX user_share_files_filepath_idx ON user_share_files(filepath);
+CREATE INDEX user_share_files_ownerid_filepath_idx ON user_share_files(ownerid, filepath);
 
 CREATE INDEX user_share_files_access_userid_idx ON user_share_files_access(user_id);
 CREATE INDEX user_share_files_access_file_id_idx ON user_share_files_access(file_id);

java-tools/OsmAndServer/src/main/java/net/osmand/server/api/repo/ShareFileRepository.java

@@ -12,12 +12,13 @@
 import java.io.Serializable;
 import java.util.Date;
 import java.util.List;
+import java.util.UUID;
 import java.util.stream.Collectors;
 
 @Repository
 public interface ShareFileRepository extends JpaRepository<ShareFileRepository.ShareFile, Long> {
 
-	ShareFile findByUuid(String uuid);
+	ShareFile findByUuid(UUID uuid);
 
 	ShareFile findByOwneridAndFilepath(int ownerid, String filepath);
 
@@ -46,7 +47,7 @@ class ShareFile implements Serializable {
 		public int ownerid;
 
 		@Column(unique = true)
-		private String uuid;
+		private UUID uuid;
 
 		@Column(nullable = false)
 		public String filepath;
@@ -114,7 +115,7 @@ public class ShareFileDTO {
 		public ShareFileDTO(ShareFile shareFile, boolean includeAccessRecords) {
 			this.id = shareFile.getId();
 			this.ownerid = shareFile.getOwnerid();
-			this.uuid = shareFile.getUuid();
+			this.uuid = shareFile.getUuid() != null ? shareFile.getUuid().toString() : null;
 			this.filepath = shareFile.getFilepath();
 			this.name = shareFile.getName();
 			this.type = shareFile.getType();

java-tools/OsmAndServer/src/main/java/net/osmand/server/api/services/ShareFileService.java

@@ -51,8 +51,8 @@ public enum PermissionType {
 	public static final String PUBLIC_SHARE_TYPE = "public";
 
 	@Transactional
-	public String generateSharedCode(PremiumUserFilesRepository.UserFile userFile, boolean publicAccess) {
-		String uniqueCode = generateUniqueCode();
+	public UUID generateSharedCode(PremiumUserFilesRepository.UserFile userFile, boolean publicAccess) {
+		UUID uniqueCode = generateUniqueCode();
 		// Update existing file with new code
 		ShareFileRepository.ShareFile existingFile = getFileByOwnerAndFilepath(userFile.userid, userFile.name);
 		if (existingFile != null) {
@@ -65,16 +65,20 @@ public String generateSharedCode(PremiumUserFilesRepository.UserFile userFile, b
 		return uniqueCode;
 	}
 
-	private String generateUniqueCode() {
-		String uniqueCode;
+	private UUID generateUniqueCode() {
+		UUID uniqueCode;
 		do {
-			uniqueCode = UUID.randomUUID().toString();
+			uniqueCode = UUID.randomUUID();
 		} while (shareFileRepository.findByUuid(uniqueCode) != null);
 		return uniqueCode;
 	}
 
 	@Transactional
-	public ShareFileRepository.ShareFile createShareFile(PremiumUserFilesRepository.UserFile userFile, boolean publicAccess, String uniqueCode) {
+	public ShareFileRepository.ShareFile createShareFile(PremiumUserFilesRepository.UserFile userFile, boolean publicAccess, UUID uniqueCode) {
+		ShareFileRepository.ShareFile existingFile = getFileByOwnerAndFilepath(userFile.userid, userFile.name);
+		if (existingFile != null) {
+			return existingFile;
+		}
 		ShareFileRepository.ShareFile shareFile = new ShareFileRepository.ShareFile();
 
 		String name = userFile.name.substring(userFile.name.lastIndexOf("/") + 1);
@@ -126,7 +130,7 @@ public boolean changeFileShareType(ShareFileRepository.ShareFile shareFile, Stri
 		} else {
 			shareFile.setPublicAccess(shareType.equals(PUBLIC_SHARE_TYPE));
 			if (shareFile.isPublicAccess() && shareFile.getUuid() == null) {
-				String uuid = generateUniqueCode();
+				UUID uuid = generateUniqueCode();
 				shareFile.setUuid(uuid);
 			}
 			shareFileRepository.saveAndFlush(shareFile);
@@ -178,7 +182,7 @@ public ShareFileRepository.ShareFile getShareFileByUuid(String uuid) {
 		if (uuid == null) {
 			return null;
 		}
-		return shareFileRepository.findByUuid(uuid);
+		return shareFileRepository.findByUuid(UUID.fromString(uuid));
 	}
 
 	@Transactional

java-tools/OsmAndServer/src/main/java/net/osmand/server/controllers/user/ShareFileController.java

@@ -24,6 +24,7 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.Map;
+import java.util.UUID;
 
 import static net.osmand.server.api.services.ShareFileService.PRIVATE_SHARE_TYPE;
 import static net.osmand.server.api.services.UserdataService.FILE_NOT_FOUND;
@@ -63,11 +64,11 @@ public ResponseEntity<String> generateLink(@RequestParam String fileName,
 		if (userFile == null) {
 			return ResponseEntity.badRequest().body(FILE_NOT_FOUND);
 		}
-		String uuid = shareFileService.generateSharedCode(userFile, publicAccess);
+		UUID uuid = shareFileService.generateSharedCode(userFile, publicAccess);
 		if (uuid == null) {
 			return ResponseEntity.badRequest().body("Error generating link");
 		}
-		return ResponseEntity.ok(gson.toJson(Map.of("uuid", uuid)));
+		return ResponseEntity.ok(gson.toJson(Map.of("uuid", uuid.toString())));
 	}
 
 	@GetMapping(path = {"/get/{uuid}"}, produces = "application/json")
@@ -167,7 +168,7 @@ public ResponseEntity<String> getFileInfo(@RequestParam String fileName,
 		if (user == null) {
 			return ResponseEntity.badRequest().body("Error getting user info");
 		}
-		String ownerName = user.nickname;
+		String ownerName = user.nickname != null ? user.nickname : user.email;
 		ShareFileRepository.ShareFileDTO shareFileDto = new ShareFileRepository.ShareFileDTO(shareFile, true);
 		return ResponseEntity.ok(gson.toJson(Map.of("owner", ownerName, "file", shareFileDto)));
 	}