Update thumbnail generation function to write thumbnail url to proper node

Author: Haydart

app/src/main/java/pl/rmakowiecki/smartalarmcore/AlarmController.kt

@@ -75,12 +75,13 @@ class AlarmController(
     private fun reportBeamBreakIncident() {
         val reportTimestamp = System.currentTimeMillis()
 
-        cameraPhotoSessionDisposable = camera.capturePhoto()
-                .flatMapSingle { backendInteractor.uploadIncidentPhoto(it, reportTimestamp) }
-                .flatMapSingle {
-                    backendInteractor.reportSecurityIncident(
-                            SecurityIncident(AlarmTriggerReason.BEAM_BREAK_DETECTOR, reportTimestamp)
-                    )
+        backendInteractor
+                .reportSecurityIncident(SecurityIncident(AlarmTriggerReason.BEAM_BREAK_DETECTOR, reportTimestamp))
+                .flatMapObservable { incidentModel ->
+                    camera.capturePhoto()
+                            .flatMapSingle { photo ->
+                                backendInteractor.uploadIncidentPhoto(photo, incidentModel.generatedId)
+                            }
                 }.applyIoSchedulers()
                 .subscribeBy(
                         onNext = { logD("Security incident report successful? $it") }

app/src/main/java/pl/rmakowiecki/smartalarmcore/remote/AlarmBackendContract.kt

@@ -11,8 +11,8 @@ interface AlarmBackendContract {
     fun signInToBackend(): Single<Boolean>
     fun observeAlarmArmingState(): Observable<AlarmArmingState>
     fun updateAlarmState(alarmState: AlarmTriggerState)
-    fun reportSecurityIncident(securityIncident: SecurityIncident): Single<Boolean>
-    fun uploadIncidentPhoto(photoBytes: ByteArray, reportTimestamp: Long): Single<Boolean>
+    fun reportSecurityIncident(securityIncident: SecurityIncident): Single<SecurityIncidentResponse>
+    fun uploadIncidentPhoto(photoBytes: ByteArray, uniqueIncidentId: String): Single<Boolean>
 
     companion object {
         fun create(activity: AlarmActivity) = AlarmBackendInteractor(activity)

app/src/main/java/pl/rmakowiecki/smartalarmcore/remote/AlarmBackendInteractor.kt

@@ -91,24 +91,38 @@ class AlarmBackendInteractor(private val activity: AlarmActivity) : AlarmBackend
                 .addOnCompleteListener { }
     }
 
-    override fun reportSecurityIncident(securityIncident: SecurityIncident): Single<Boolean> = Single.create { emitter ->
-        databaseNode.child(getCurrentBackendUser()?.uid)
+    override fun reportSecurityIncident(securityIncident: SecurityIncident): Single<SecurityIncidentResponse> = Single.create { emitter ->
+        val securityIncidentNodeReference = databaseNode.child(getCurrentBackendUser()?.uid)
                 .child(Nodes.INCIDENTS)
                 .push()
+
+        securityIncidentNodeReference
                 .setValue(RemoteSecurityIncident.from(securityIncident))
-                .addOnCompleteListener { emitter.onSuccess(it.isSuccessful) }
+                .addOnCompleteListener {
+                    emitter.onSuccess(
+                            SecurityIncidentResponse(it.isSuccessful, securityIncidentNodeReference.key)
+                    )
+                }
     }
 
-    override fun uploadIncidentPhoto(photoBytes: ByteArray, reportTimestamp: Long): Single<Boolean> = Single.create { emitter ->
+    override fun uploadIncidentPhoto(photoBytes: ByteArray, uniqueIncidentId: String): Single<Boolean> = Single.create { emitter ->
         storageNode.child(CORE_DEVICE_DIRECTORY)
                 .child(IMAGES_DIRECTORY)
                 .child(getCurrentBackendUser()?.uid ?: "non_assignable_incidents")
-                .child("$reportTimestamp.jpg")
+                .child("$uniqueIncidentId.jpg")
                 .putBytes(photoBytes)
                 .addOnCompleteListener { emitter.onSuccess(it.isSuccessful) }
     }
 }
 
 private fun DataSnapshot.getArmingState() = (this.value as Boolean).toArmingState()
 
-class RemoteAlarmStateModel(val active: Boolean, val triggered: Boolean)
+class RemoteAlarmStateModel(
+        val active: Boolean,
+        val triggered: Boolean
+)
+
+class SecurityIncidentResponse(
+        val isSuccessful: Boolean,
+        val generatedId: String
+)

functions/index.js

@@ -78,6 +78,11 @@ exports.generateThumbnail = functions.storage.object().onChange(event => {
   const tempLocalDir = path.dirname(tempLocalFile);
   const tempLocalThumbFile = path.join(os.tmpdir(), thumbFilePath);
 
+  const pathParts = fileDir.split('/')
+
+  const coreDeviceUid = pathParts[pathParts.length - 1]
+  const incidentUid = fileName.slice(0, -4);
+
   // Exit if this is triggered on a file that is not an image.
   if (!event.data.contentType.startsWith('image/')) {
     console.log('This is not an image.');
@@ -139,7 +144,7 @@ exports.generateThumbnail = functions.storage.object().onChange(event => {
     const originalResult = results[1];
     const thumbFileUrl = thumbResult[0];
     const fileUrl = originalResult[0];
-    // Add the URLs to the Database
-    return admin.database().ref('images').push({path: fileUrl, thumbnail: thumbFileUrl});
+
+    return admin.database().ref(`/${coreDeviceUid}/incidents/${incidentUid}/thumbnailUrl`).set(thumbFileUrl);
   }).then(() => console.log('Thumbnail URLs saved to database.'));
 });