Add in ability to edit pins

App.js

@@ -12,7 +12,7 @@ import NavigationService from './utils/NavigationService';
 import Onboarding from './containers/Onboarding';
 import Navigation from './nav';
 import reducer from './reducers';
-import { createDatabases } from './apis/database';
+import { createOrUpdateDatabase } from './apis/database';
 import { initialize } from './apis';
 import { restore } from './actions/authentication';
 import { setup } from './actions/connectivity';
@@ -45,7 +45,7 @@ class App extends Component {
   componentDidMount() {
     Promise.all([
       ...this.loadFontsAsync(),
-      createDatabases(),
+      createOrUpdateDatabase(),
       I18n.initAsync(),
       store.dispatch(positionActions.initialize()),
       store.dispatch(

actions/locations.js

@@ -1,4 +1,6 @@
 import Sentry from 'sentry-expo';
+import { Alert } from 'react-native';
+import i18n from '../assets/i18n/i18n';
 import * as apis from '../apis';
 import { requestPushPermission } from './permissions';
 import { containing } from './regions';
@@ -15,6 +17,14 @@ function receiveLocation(location) {
   };
 }
 
+export const REMOVE_LOCATION = 'REMOVE_LOCATION';
+function removeLocation(locationKey) {
+  return {
+    type: REMOVE_LOCATION,
+    locationKey,
+  };
+}
+
 export const CLEAR_LOCATIONS = 'CLEAR_LOCATIONS';
 export function clearLocations() {
   return {
@@ -40,6 +50,8 @@ function wrapper(work, location) {
       await work;
       await dispatch(updateUploadStatus(location, true));
       dispatch(uploaded(location.key));
+      const uploadedLocation = { ...location, uploaded: true };
+      dispatch(receiveLocation(uploadedLocation));
     } catch (err) {
       Sentry.captureException(err, {
         extra: {
@@ -69,6 +81,34 @@ export function restoreLocalLocations() {
   };
 }
 
+export function deleteLocalLocation(locationKey) {
+  return async (dispatch) => {
+    const result = await new Promise((resolve) => {
+      Alert.alert(
+        i18n.t('location/delete'),
+        i18n.t('location/confirmDelete'),
+        [
+          { text: i18n.t('button/cancel'), style: 'cancel', onPress: () => resolve(false) },
+          { text: i18n.t('button/delete'), onPress: () => resolve(true) },
+        ],
+        {
+          cancelable: true,
+          onDismiss: () => resolve(false),
+        }
+      );
+    });
+
+    if (result) {
+      database
+        .deleteLocation(locationKey)
+        .then(() => dispatch(removeLocation(locationKey)))
+        .catch((err) => {
+          Sentry.captureException(err);
+        });
+    }
+  };
+}
+
 export function fetchLocation(locationKey) {
   return async (dispatch, getState) => {
     const {
@@ -96,28 +136,21 @@ export function fetchAllLocationData(locationKey) {
   };
 }
 
-export function createLocation(options) {
-  const { latitude, longitude, resources, status } = options;
+function pushLocation(localLocation, locationData, apiCall) {
+  const showOutdatedAlert = () =>
+    Alert.alert(i18n.t('location/errorUpdate'), i18n.t('location/errorUpdateDescription'), [
+      {
+        text: i18n.t('button/ok'),
+        onPress: () => {},
+      },
+    ]);
 
   return async (dispatch, getState) => {
     const {
       authentication: { regionKey: hasRegion },
       connected,
-      onboarding: { hasAddedLocation },
     } = getState();
 
-    if (!hasAddedLocation) {
-      dispatch(setCompleted(COMPLETED_KEYS.hasAddedLocation));
-    }
-
-    const locationData = {
-      latitude,
-      longitude,
-      resources,
-      status,
-    };
-
-    const localLocation = await database.addLocalLocation(locationData);
     const { key } = localLocation;
 
     dispatch(offline(key));
@@ -134,13 +167,58 @@ export function createLocation(options) {
         return;
       }
 
-      const { created: location, saved } = await apis.createLocation(regionKey, locationData, key);
+      const { created: location, saved } = await apiCall(regionKey, key, localLocation, showOutdatedAlert);
 
       await dispatch(wrapper(saved, location));
     }
   };
 }
 
+export function updateLocation(options, oldLocationKey) {
+  const { latitude, longitude, resources, status } = options;
+
+  return async (dispatch, getState) => {
+    const { locations } = getState();
+
+    const oldLocation = locations[oldLocationKey];
+
+    const locationData = {
+      latitude,
+      longitude,
+      resources,
+      status,
+    };
+
+    const localLocation = await database.updateLocalLocation(locationData, oldLocation);
+
+    dispatch(pushLocation(localLocation, locationData, apis.updateLocation));
+  };
+}
+
+export function createLocation(options) {
+  const { latitude, longitude, resources, status } = options;
+
+  return async (dispatch, getState) => {
+    const {
+      onboarding: { hasAddedLocation },
+    } = getState();
+
+    if (!hasAddedLocation) {
+      dispatch(setCompleted(COMPLETED_KEYS.hasAddedLocation));
+    }
+
+    const locationData = {
+      latitude,
+      longitude,
+      resources,
+      status,
+    };
+
+    const localLocation = await database.addLocalLocation(locationData);
+    dispatch(pushLocation(localLocation, locationData, apis.createLocation));
+  };
+}
+
 export function pushLocalLocations() {
   return async (dispatch, getState) => {
     const {

apis/database.js

@@ -1,9 +1,12 @@
-import { SQLite } from 'expo';
+import { SQLite, SecureStore } from 'expo';
 import Sentry from 'sentry-expo';
 import moment from 'moment';
 import { pushRef } from './index';
 import { convertArrayToLocations, convertToLocation, createLocationObject, saveCoordinates } from '../utils/database';
 
+const DATABASE_VERSION_KEY = 'DATABASE_VERSION_KEY';
+const DATABASE_VERSION = '2';
+
 export function openDatabase(databaseName = 'locations.1.db') {
   return SQLite.openDatabase(databaseName);
 }
@@ -23,30 +26,58 @@ export function executeTransaction(statement, args = null) {
   });
 }
 
-export function createDatabases() {
+function createDatabases() {
   return executeTransaction(
-    'create table if not exists locations (id integer primary key not null, key text, coordinateKey text, createdAt text, resources text, status text, uploaded int)'
+    'create table if not exists locations (id integer primary key not null, key text, coordinateKey text, createdAt text, resources text, status text, uploaded int, updated int)'
   );
 }
 
 export function clearDatabase() {
   return executeTransaction('drop table locations');
 }
 
+export function deleteLocation(key) {
+  return executeTransaction('delete from locations where key = ?', [key]);
+}
+
 export function updateUploadStatus(key, isUploaded) {
   return executeTransaction('update locations set uploaded = ? where key = ?', [isUploaded, key]);
 }
 
-export function updateLocalLocation(options) {
-  const { resources, status, key } = options;
-  // Uncomment this if user is ever able to change location position
-  // SecureStore.setItemAsync(key, JSON.parse({ longitude, latitude }));
+export function replaceLocalLocationWithRemote(remoteLocation) {
+  const { key, latitude, longitude, updated, status, resources } = remoteLocation;
+
+  saveCoordinates(key, latitude, longitude);
+
+  return executeTransaction('update locations set status = ?, resources = ?, updated = ?, uploaded = 1 where key = ?', [
+    status,
+    JSON.stringify(resources),
+    updated,
+    key,
+  ]);
+}
+
+export async function updateLocalLocation(options, oldLocation) {
+  const { key, updated = 0 } = oldLocation;
+  const { latitude, longitude, resources, status } = options;
+
+  saveCoordinates(key, latitude, longitude);
+
+  const locationObject = createLocationObject(key, {
+    ...oldLocation,
+    ...options,
+    uploaded: false,
+    updated: oldLocation.uploaded ? oldLocation.updated + 1 : oldLocation.updated,
+  });
 
-  return executeTransaction('update locations set resources = ?, status = ?, uploaded = 0 where key = ?', [
+  await executeTransaction('update locations set resources = ?, status = ?, uploaded = 0, updated = ? where key = ?', [
     resources,
     status,
+    updated + 1,
     key,
   ]);
+
+  return locationObject;
 }
 
 // fetches individual location
@@ -80,9 +111,35 @@ export async function addLocalLocation(locationData) {
 
   const createdAt = moment.utc(locationObject.created).toISOString();
   await executeTransaction(
-    'insert into locations (key, coordinateKey, createdAt, resources, status, uploaded) values (?, ?, ?, ?, ?, ?)',
-    [key, key, createdAt, resourcesString, status, 0]
+    'insert into locations (key, coordinateKey, createdAt, resources, status, uploaded, updated) values (?, ?, ?, ?, ?, ?, ?)',
+    [key, key, createdAt, resourcesString, status, 0, 0]
   );
 
   return locationObject;
 }
+
+export async function createOrUpdateDatabase() {
+  const version = await SecureStore.getItemAsync(DATABASE_VERSION_KEY);
+
+  await createDatabases();
+
+  if (version === DATABASE_VERSION) {
+    return Promise.resolve();
+  }
+
+  const locations = await fetchLocalLocations();
+
+  await clearDatabase();
+  await createDatabases();
+
+  const transactions = locations.map((location) => {
+    const { key, createdAt, resources, status, uploaded = 0, updated = 0 } = location;
+
+    return executeTransaction(
+      'insert into locations (key, coordinateKey, createdAt, resources, status, uploaded, updated) values (?, ?, ?, ?, ?, ?, ?)',
+      [key, key, createdAt, JSON.stringify(resources), status, uploaded, updated]
+    );
+  });
+
+  return Promise.all(transactions).then(() => SecureStore.setItemAsync(DATABASE_VERSION_KEY, DATABASE_VERSION));
+}

apis/index.js

@@ -1,8 +1,10 @@
+import Sentry from 'sentry-expo';
 import Expo from 'expo';
 import * as firebase from 'firebase';
 import GeoFire from 'geofire';
 import { wrapLatitude, wrapLongitude } from '../utils/geo';
 import { createLocationObject } from '../utils/database';
+import { replaceLocalLocationWithRemote } from '../apis/database';
 
 export function initialize() {
   if (firebase.initialized) {
@@ -86,7 +88,44 @@ export function fetchLocation(locationKey) {
     .then((location) => location.val());
 }
 
-export async function createLocation(regionKey, options, key) {
+export async function updateLocation(regionKey, key, newLocation, showOutdatedAlert) {
+  initialize();
+
+  let pushed;
+  if (key) {
+    pushed = getRef(`locations/${key}`);
+  } else {
+    pushed = pushRef('locations');
+  }
+
+  try {
+    const existing = await fetchLocation(key);
+    if (existing && existing.key && existing.updated >= newLocation.updated) {
+      showOutdatedAlert();
+      await replaceLocalLocationWithRemote(existing);
+      return {
+        created: existing,
+        saved: Promise.resolve(),
+      };
+    }
+  } catch (err) {
+    Sentry.captureException(err, {
+      extra: {
+        locationKey: key,
+      },
+    });
+  }
+
+  const saved = pushed.set(newLocation);
+  const geoPromises = saveGeoData(newLocation, pushed.key, regionKey);
+
+  return {
+    created: newLocation,
+    saved: Promise.all([saved, ...geoPromises]),
+  };
+}
+
+export async function createLocation(regionKey, key, options) {
   initialize();
 
   let pushed;

assets/i18n/locales/en.json

@@ -4,6 +4,7 @@
   "button/push_locations": "Upload",
   "button/save": "Save",
   "button/offline": "Offline",
+  "button/delete": "Delete",
   "connectivity/action_requires_connection": "The requested action requires an active network connection",
   "export/body": "Here is my data from the Share Bibles App",
   "export/error_title": "Export Failed",
@@ -17,6 +18,11 @@
   "invites/error_title": "Access Code Issue",
   "invites/error": "There was an issue accepting your Access Code, please try again and/or contact {{email}}",
   "invites/placeholder": "Access Code",
+  "location/edit": "Edit location",
+  "location/delete": "Delete location",
+  "location/errorUpdate": "Edit failed",
+  "location/errorUpdateDescription": "Someone else already updated this location. We have downloaded their update to your device. Please review the update and try your changes again.",
+  "location/confirmDelete": "Are you sure you want to delete this location? This action cannot be undone!",
   "locationData/failed_upload": "Failed to upload: {{value}}",
   "locationData/incorrect_region": "Location is not within your current region!",
   "locationData/latitude": "Latitude: {{value}}",
@@ -85,6 +91,7 @@
   "title/accept_invites": "Accept Access Codes",
   "title/location_data": "Upload Status",
   "title/share_bibles": "Share Bibles",
+  "title/editing": "Editing",
   "validation/no_status_message": "You must provide a status",
   "validation/no_status_title": "No status",
   "validation/unknown_error_message": "An unexpected error has occurred, please try again.",