ClaytonWWilson/Listify
1
0
Fork 0
mirror of https://github.com/ClaytonWWilson/Listify.git synced 2026-03-11 11:05:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed merge conflict in List.java

Browse Source
This commit is contained in:
Adam Ding
2020-12-01 01:46:22 -05:00
parent fcc243faef 4c1446cc39
commit f9cc1b40a4
38 changed files with 973 additions and 269 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Lambdas/Lists/List/src/List.java
View File

@@ -89,11 +89,9 @@ public class List {
public ItemEntry[] getEntries() {
return entries.toArray(new ItemEntry[entries.size()]);
//return;
}
public void addItemEntry(ItemEntry entry) {
entries.add(entry);
//return;
}
}

12
Lambdas/Lists/List/src/ListGetter.java
View File

@@ -12,7 +12,7 @@ public class ListGetter implements CallHandler{
private final String cognitoID;
private final String GET_LIST = "SELECT * FROM List WHERE listID = ?;";
private final String GET_LISTS = "SELECT listID FROM ListSharee WHERE userID = ? ORDER BY uiPosition;";
private final String GET_LISTS = "SELECT listID, permissionLevel FROM ListSharee WHERE userID = ? ORDER BY uiPosition;";
private final String SHARE_CHECK = "SELECT * FROM ListSharee WHERE listID = ?;";
private final String GET_ENTRIES = "SELECT * FROM ListProduct WHERE listID = ?;";
@@ -32,7 +32,10 @@ public class ListGetter implements CallHandler{
System.out.println(getListsResults);
ArrayList<Integer> listIds = new ArrayList<>();
while (getListsResults.next()) {
listIds.add(getListsResults.getInt(1));
Integer permissionLevel = getListsResults.getInt("permissionLevel");
if (ListPermissions.hasPermission(permissionLevel, "Read")) {
listIds.add(getListsResults.getInt("listID"));
}
}
return listIds;
}
@@ -43,7 +46,7 @@ public class ListGetter implements CallHandler{
int sharees = 0;
boolean verifiedAccess = false;
int uiPosition = 1;
while ((sharees < 2 && accessResults.next()) || !verifiedAccess) {
while (accessResults.next() && (sharees < 2 || !verifiedAccess )) {
int permissionLevel = accessResults.getInt("permissionLevel");
if (accessResults.getString("userID").equals(cognitoID)) {
verifiedAccess = true;
@@ -56,6 +59,9 @@ public class ListGetter implements CallHandler{
sharees++;
}
}
if (!verifiedAccess) {
throw new AccessControlException("User " + cognitoID + " does not have ant permission for list " + id);
}
boolean shared = false;
if (sharees > 1) {
shared = true;

2
Lambdas/Lists/List/src/ListPermissions.java
View File

@@ -24,7 +24,7 @@ public class ListPermissions {
}
public static boolean hasPermission(Integer level, String permission) {
return level % getKeyForPermission(permission) == 0;
return (level % getKeyForPermission(permission) == 0 && level != 0);
}
public static Integer getKeyForPermission(String permissionRaw) {