Share GPX

db/sql_changeset_schema

@@ -27,7 +27,7 @@ ALTER TABLE supporters_device_sub add primary key (sku, orderid);
 ------ PREMIUM accounts ----
 CREATE TABLE user_accounts(id serial primary key, email text not null, tokendevice text, orderid text, token text, tokentime timestamp, regtime timestamp); 
 CREATE TABLE user_account_devices(id serial primary key, userid integer, deviceid text, accesstoken text, lang text, brand text, model text, udpatetime timestamp); 
-CREATE TABLE user_files(id bigserial primary key, type text, name text, userid integer, deviceid integer, updatetime timestamp, clienttime timestamp, filesize bigint, zipfilesize bigint, storage text, gendetails jsonb, data bytea, shared_url text, shared_info jsonb);
+CREATE TABLE user_files(id bigserial primary key, type text, name text, userid integer, deviceid integer, updatetime timestamp, clienttime timestamp, filesize bigint, zipfilesize bigint, storage text, gendetails jsonb, data bytea, shared_code text, shared_info jsonb);
 CREATE TABLE promo_campaigns(name text, starttime timestamp, endtime timestamp, subactivemonths integer, numberlimit integer, used integer, lastusers text);
 ALTER TABLE user_accounts ADD CONSTRAINT email_uniq UNIQUE (email);
 --- 

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

@@ -38,7 +38,7 @@ public interface PremiumUserFilesRepository extends JpaRepository<UserFile, Long
 
 	Iterable<UserFile> findAllByUserid(int userid);
 
-	UserFile findUserFileBySharedUrl(String sharedUrl);
+	UserFile findUserFileBySharedCode(String code);
 
 	@Query("SELECT uf FROM UserFile uf " +
 			"WHERE uf.userid = :userid AND uf.name LIKE :folderName% AND uf.type = :type " +
@@ -95,8 +95,8 @@ class UserFile {
         @Column(name = "data", columnDefinition="bytea")
         public byte[] data;
 
-	    @Column(name = "shared_url")
-	    public String sharedUrl;
+	    @Column(name = "shared_code")
+	    public String sharedCode;
 
 	    @Column(name = "shared_info", columnDefinition = "jsonb")
 	    @Type(type = "net.osmand.server.assist.data.JsonbType")

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

@@ -1194,19 +1194,6 @@ public void updateDeviceLangInfo(PremiumUserDevicesRepository.PremiumUserDevice
         }
     }
 
-	@Transactional
-	public String generateSharedUrl(PremiumUserFilesRepository.UserFile userFile) {
-		String uniqueToken = UUID.randomUUID().toString();
-		userFile.sharedUrl = uniqueToken;
-		filesRepository.saveAndFlush(userFile);
-
-		return uniqueToken;
-	}
-
-	public PremiumUserFilesRepository.UserFile getUserFileBySharedUrl(String token) {
-		return filesRepository.findUserFileBySharedUrl(token);
-	}
-
 	public MapApiController.FileDownloadResult getFile(PremiumUserFilesRepository.UserFile userFile, PremiumUserDevicesRepository.PremiumUserDevice dev) throws IOException {
 		if (userFile == null || dev == null) {
 			return null;
@@ -1220,96 +1207,4 @@ public MapApiController.FileDownloadResult getFile(PremiumUserFilesRepository.Us
 		}
 		return null;
 	}
-
-	public GpxFile getFile(PremiumUserFilesRepository.UserFile file) throws IOException {
-		if (file == null || file.data == null) {
-			return null;
-		}
-		try (InputStream inputStream = new GZIPInputStream(new ByteArrayInputStream(file.data));
-		     Source source = new Buffer().readFrom(inputStream)) {
-			GpxFile gpxFile = GpxUtilities.INSTANCE.loadGpxFile(source);
-			if (gpxFile.getError() == null) {
-				return gpxFile;
-			}
-			return null;
-		}
-	}
-
-	public static class FileSharedInfo {
-		public Set<Integer> accessedUsers;
-		public Set<Integer> blackList;
-
-		public FileSharedInfo(Set<Integer> accessedUsers, Set<Integer> blackList) {
-			this.accessedUsers = accessedUsers;
-			this.blackList = blackList;
-		}
-
-		public FileSharedInfo() {
-			this.accessedUsers = new HashSet<>();
-			this.blackList = new HashSet<>();
-		}
-	}
-
-	public boolean saveAccessedUser(PremiumUserDevicesRepository.PremiumUserDevice dev, PremiumUserFilesRepository.UserFile userFile) {
-		final String ACCESSED_USERS = "accessedUsers";
-		FileSharedInfo fileSharedInfo = gson.fromJson(userFile.sharedInfo, FileSharedInfo.class);
-		if (fileSharedInfo == null) {
-			fileSharedInfo = new FileSharedInfo();
-		}
-		if (!fileSharedInfo.blackList.contains(dev.userid)) {
-			if (fileSharedInfo.accessedUsers.add(dev.userid)) {
-				userFile.sharedInfo.add(ACCESSED_USERS, gson.toJsonTree(fileSharedInfo.accessedUsers));
-				filesRepository.saveAndFlush(userFile);
-			}
-			return true;
-		}
-		return false;
-	}
-
-	public List<String> getAccessedUsers(PremiumUserFilesRepository.UserFile userFile) {
-		List<String> accessedUsers = new ArrayList<>();
-		FileSharedInfo fileSharedInfo = gson.fromJson(userFile.sharedInfo, FileSharedInfo.class);
-		if (fileSharedInfo != null && fileSharedInfo.accessedUsers != null) {
-			for (Integer userId : fileSharedInfo.accessedUsers) {
-				PremiumUsersRepository.PremiumUser pu = usersRepository.findById(userId);
-				if (pu != null) {
-					accessedUsers.add(pu.email);
-				}
-			}
-		}
-		return accessedUsers;
-	}
-
-	@Transactional
-	public boolean createFileBlacklist(PremiumUserFilesRepository.UserFile userFile, List<String> list) {
-		final String BLACK_LIST = "blackList";
-		FileSharedInfo fileSharedInfo = gson.fromJson(userFile.sharedInfo, FileSharedInfo.class);
-		if (fileSharedInfo == null) {
-			fileSharedInfo = new FileSharedInfo();
-		}
-		fileSharedInfo.blackList.addAll(list.stream().map(email -> {
-			PremiumUsersRepository.PremiumUser pu = usersRepository.findByEmailIgnoreCase(email);
-			return pu != null ? pu.id : null;
-		}).filter(Objects::nonNull).toList());
-		if (fileSharedInfo.blackList.isEmpty()) {
-			return false;
-		}
-		userFile.sharedInfo.add(BLACK_LIST, gson.toJsonTree(fileSharedInfo.blackList));
-		filesRepository.saveAndFlush(userFile);
-		return true;
-	}
-
-	public List<String> getBlackList(PremiumUserFilesRepository.UserFile userFile) {
-		List<String> blackList = new ArrayList<>();
-		FileSharedInfo fileSharedInfo = gson.fromJson(userFile.sharedInfo, FileSharedInfo.class);
-		if (fileSharedInfo != null && fileSharedInfo.blackList != null) {
-			for (Integer userId : fileSharedInfo.blackList) {
-				PremiumUsersRepository.PremiumUser pu = usersRepository.findById(userId);
-				if (pu != null) {
-					blackList.add(pu.email);
-				}
-			}
-		}
-		return blackList;
-	}
 }

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

@@ -0,0 +1,129 @@
+package net.osmand.server.api.services.shareGpx;
+
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+
+public class FileSharedInfo {
+	private Whitelist whitelist;
+	private Blacklist blacklist;
+	private AccessedUsers accessedUsers;
+
+	public FileSharedInfo() {
+		this(new Whitelist(), new Blacklist(), new AccessedUsers());
+	}
+
+	public FileSharedInfo(Whitelist whitelist, Blacklist blacklist, AccessedUsers accessedUsers) {
+		this.whitelist = whitelist;
+		this.blacklist = blacklist;
+		this.accessedUsers = accessedUsers;
+	}
+
+	public Whitelist getWhitelist() {
+		return whitelist;
+	}
+
+	public void setWhitelist(Whitelist whitelist) {
+		this.whitelist = whitelist;
+	}
+
+	public Blacklist getBlacklist() {
+		return blacklist;
+	}
+
+	public void setBlacklist(Blacklist blacklist) {
+		this.blacklist = blacklist;
+	}
+
+	public AccessedUsers getAccessedUsers() {
+		return accessedUsers;
+	}
+
+	public void setAccessedUsers(AccessedUsers accessedUsers) {
+		this.accessedUsers = accessedUsers;
+	}
+
+	public static class Whitelist {
+		private Map<Integer, Permission> permissions;
+
+		public Whitelist() {
+			this(new HashMap<>());
+		}
+
+		public Whitelist(Map<Integer, Permission> permissions) {
+			this.permissions = permissions != null ? permissions : new HashMap<>();
+		}
+
+		public Map<Integer, Permission> getPermissions() {
+			return permissions;
+		}
+
+		public void setPermissions(Map<Integer, Permission> permissions) {
+			this.permissions = permissions;
+		}
+	}
+
+	public static class Permission {
+		private PermissionType permissionType;
+
+		public Permission(PermissionType permissionType) {
+			this.permissionType = permissionType;
+		}
+
+		public PermissionType getPermissionType() {
+			return permissionType;
+		}
+
+		public void setPermissionType(PermissionType permissionType) {
+			this.permissionType = permissionType;
+		}
+	}
+
+	public enum PermissionType {
+		READ,
+		WRITE,
+		EXECUTE
+	}
+
+	public static class Blacklist {
+		private Set<Integer> users;
+
+		public Blacklist() {
+			this(new HashSet<>());
+		}
+
+		public Blacklist(Set<Integer> users) {
+			this.users = users != null ? users : new HashSet<>();
+		}
+
+		public Set<Integer> getUsers() {
+			return users;
+		}
+
+		public void setUsers(Set<Integer> users) {
+			this.users = users;
+		}
+	}
+
+	public static class AccessedUsers {
+		private Set<Integer> users;
+
+		public AccessedUsers() {
+			this(new HashSet<>());
+		}
+
+		public AccessedUsers(Set<Integer> users) {
+			this.users = users != null ? users : new HashSet<>();
+		}
+
+		public Set<Integer> getUsers() {
+			return users;
+		}
+
+		public void setUsers(Set<Integer> users) {
+			this.users = users;
+		}
+	}
+
+}