From 45562414e409ab31a465a60f7a702940ef369b05 Mon Sep 17 00:00:00 2001
From: Janis Hutz <development@janishutz.com>
Date: Mon, 9 Oct 2023 17:49:45 +0200
Subject: [PATCH] fix bug in seat selector + more android stuff

---
 .../com/janishutz/libreevent/MainActivity.kt  |  4 +-
 .../janishutz/libreevent/ScannerActivity.kt   |  6 +--
 src/server/backend/api/getHandler.js          |  1 +
 src/server/backend/api/postHandler.js         | 40 +++++++++++--------
 src/server/data/booked.json                   |  2 +-
 5 files changed, 30 insertions(+), 23 deletions(-)

diff --git a/src/apps/Android/app/src/main/java/com/janishutz/libreevent/MainActivity.kt b/src/apps/Android/app/src/main/java/com/janishutz/libreevent/MainActivity.kt
index 80743ae..bb3e9da 100644
--- a/src/apps/Android/app/src/main/java/com/janishutz/libreevent/MainActivity.kt
+++ b/src/apps/Android/app/src/main/java/com/janishutz/libreevent/MainActivity.kt
@@ -18,7 +18,7 @@ class MainActivity : AppCompatActivity() {
         val policy = ThreadPolicy.Builder().permitAll().build()
         StrictMode.setThreadPolicy(policy)
 
-        val sharedPref = getPreferences( MODE_PRIVATE )
+        val sharedPref = getSharedPreferences( "login", MODE_PRIVATE )
 
         val hasSwitched = intent.hasExtra("hasSwitched")
 
@@ -50,7 +50,7 @@ class MainActivity : AppCompatActivity() {
         val res = ApiClient().authenticateUser( url, username, password )
         println( res )
         if ( res == "authOk" ) {
-            val sharedPref = getPreferences( MODE_PRIVATE )
+            val sharedPref = getSharedPreferences( "login", MODE_PRIVATE )
             val editor = sharedPref.edit()
             editor.putString( "username", username )
             editor.putString( "password", password )
diff --git a/src/apps/Android/app/src/main/java/com/janishutz/libreevent/ScannerActivity.kt b/src/apps/Android/app/src/main/java/com/janishutz/libreevent/ScannerActivity.kt
index 2708de1..c030541 100644
--- a/src/apps/Android/app/src/main/java/com/janishutz/libreevent/ScannerActivity.kt
+++ b/src/apps/Android/app/src/main/java/com/janishutz/libreevent/ScannerActivity.kt
@@ -4,7 +4,6 @@ import android.Manifest
 import android.app.AlertDialog
 import android.content.Intent
 import android.content.pm.PackageManager
-import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
 import android.widget.Button
 import androidx.core.app.ActivityCompat
@@ -28,7 +27,7 @@ class ScannerActivity : CaptureActivity() {
 
         val logoutButton = findViewById<Button>(R.id.logoutButton)
         logoutButton.setOnClickListener {
-            val sharedPref = getPreferences( MODE_PRIVATE )
+            val sharedPref = getSharedPreferences( "login", MODE_PRIVATE )
             val editor = sharedPref.edit()
             editor.remove( "loginOk" )
             editor.remove( "username" )
@@ -64,8 +63,7 @@ class ScannerActivity : CaptureActivity() {
 
     private fun handleScanResult(result: String) {
         if ( lastScanned != result ) {
-            println(result)
-            val sharedPref = getPreferences( MODE_PRIVATE )
+            val sharedPref = getSharedPreferences( "login", MODE_PRIVATE )
 
             ApiClient().checkTicket( sharedPref.getString( "url", null ).toString(),
                 sharedPref.getString( "username", null ).toString(),
diff --git a/src/server/backend/api/getHandler.js b/src/server/backend/api/getHandler.js
index bdd775b..43980da 100644
--- a/src/server/backend/api/getHandler.js
+++ b/src/server/backend/api/getHandler.js
@@ -29,6 +29,7 @@ class GETHandler {
             } else if ( call === 'getReservedSeats' ) {
                 if ( query.event ) {
                     db.getDataSimple( 'temp', 'user_id', session.id ).then( dat => {
+                        // console.log( dat[ 0 ] ? JSON.parse( dat[ 0 ].data )[ query.event ] ?? {} : {} );
                         resolve( { 'user': dat[ 0 ] ? JSON.parse( dat[ 0 ].data )[ query.event ] ?? {} : {} } );
                     } ).catch( () => {
                         reject( { 'code': 500, 'message': 'ERR_DB' } );
diff --git a/src/server/backend/api/postHandler.js b/src/server/backend/api/postHandler.js
index 11417e1..422ef63 100644
--- a/src/server/backend/api/postHandler.js
+++ b/src/server/backend/api/postHandler.js
@@ -208,25 +208,33 @@ class POSTHandler {
                     if ( this.allSelectedSeats[ data.eventID ][ data.id ] || this.temporarilySelected[ data.eventID ][ data.id ] ) {
                         reject( { 'code': 409, 'message': 'ERR_ALREADY_SELECTED' } );
                     } else {
-                        let info = {};
-                        info[ data.eventID ] = {};
-                        info[ data.eventID ][ data.id ] = data;
-                        db.writeDataSimple( 'temp', 'user_id', session.id, { 'user_id': session.id, 'timestamp': new Date().toString(), 'data': JSON.stringify( info ) } ).then( () => {
-                            if ( !this.temporarilySelectedTotals[ session.id ] ) {
-                                this.temporarilySelectedTotals[ session.id ] = {};
-                                this.temporarilySelectedTotals[ session.id ][ data.eventID ] = {};
+                        db.getDataSimple( 'temp', 'user_id', session.id ).then( dat => {
+                            let info = {};
+                            if ( dat[ 0 ] ) {
+                                info = JSON.parse( dat[ 0 ].data );
                             }
-                            if ( !this.temporaryTotals[ data.eventID ] ) {
-                                this.temporaryTotals[ data.eventID ] = 0;
+                            if ( !info[ data.eventID ] ) {
+                                info[ data.eventID ] = {};
                             }
-                            this.temporarilySelected[ data.eventID ] = info[ data.eventID ];
-                            this.temporaryTotals[ data.eventID ] += 1;
-                            this.temporarilySelectedTotals[ session.id ][ data.eventID ][ data.id ] = 1;
-                            this.countFreeSeats();
-                            resolve( 'ok' );
-                        } ).catch( err => {
-                            console.error( err );
+                            info[ data.eventID ][ data.id ] = data;
+                            db.writeDataSimple( 'temp', 'user_id', session.id, { 'user_id': session.id, 'timestamp': new Date().toString(), 'data': JSON.stringify( info ) } ).then( () => {
+                                if ( !this.temporarilySelectedTotals[ session.id ] ) {
+                                    this.temporarilySelectedTotals[ session.id ] = {};
+                                    this.temporarilySelectedTotals[ session.id ][ data.eventID ] = {};
+                                }
+                                if ( !this.temporaryTotals[ data.eventID ] ) {
+                                    this.temporaryTotals[ data.eventID ] = 0;
+                                }
+                                this.temporarilySelected[ data.eventID ] = info[ data.eventID ];
+                                this.temporaryTotals[ data.eventID ] += 1;
+                                this.temporarilySelectedTotals[ session.id ][ data.eventID ][ data.id ] = 1;
+                                this.countFreeSeats();
+                                resolve( 'ok' );
+                            } ).catch( err => {
+                                console.error( err );
+                            } );
                         } );
+                        // TODO: Add catch block
                     }
                 }
             } else if ( call === 'deselectTicket' ) {
diff --git a/src/server/data/booked.json b/src/server/data/booked.json
index 1a53498..50a9f77 100644
--- a/src/server/data/booked.json
+++ b/src/server/data/booked.json
@@ -1 +1 @@
-{"test4":{"secAr4s7":{"id":"secAr4s7","component":1,"ticketOption":"1","eventID":"test4","category":"1","name":"Row 5, Seat 8"},"secAr6s14":{"id":"secAr6s14","component":1,"ticketOption":"2","eventID":"test4","category":"1","name":"Row 7, Seat 15"},"secAr6s10":{"id":"secAr6s10","component":1,"ticketOption":"2","eventID":"test4","category":"1","name":"Row 7, Seat 11"},"comp1secAr5s11":{"id":"comp1secAr5s11","component":1,"ticketOption":"2","eventID":"test4","category":"1","name":"Row 6, Seat 12"}},"test3":{"ticket1_1":{"id":"ticket1_1","component":1,"ticketOption":"1","eventID":"test3","count":10,"category":"1","name":"Category 1 (Child)"},"ticket1":{"id":"ticket1_1","component":1,"ticketOption":"1","eventID":"test3","count":1,"category":"1","name":"Category 1 (Child)"}}}
\ No newline at end of file
+{"test4":{"secAr4s7":{"id":"secAr4s7","component":1,"ticketOption":"1","eventID":"test4","category":"1","name":"Row 5, Seat 8"},"secAr6s14":{"id":"secAr6s14","component":1,"ticketOption":"2","eventID":"test4","category":"1","name":"Row 7, Seat 15"},"secAr6s10":{"id":"secAr6s10","component":1,"ticketOption":"2","eventID":"test4","category":"1","name":"Row 7, Seat 11"},"comp1secAr5s11":{"id":"comp1secAr5s11","component":1,"ticketOption":"2","eventID":"test4","category":"1","name":"Row 6, Seat 12"}},"test3":{"ticket1_1":{"id":"ticket1_1","component":1,"ticketOption":"1","eventID":"test3","count":10,"category":"1","name":"Category 1 (Child)"},"ticket1":{"id":"ticket1_1","component":1,"ticketOption":"1","eventID":"test3","count":1,"category":"1","name":"Category 1 (Child)"}},"complexLocationTest":{"comp4secAr2s25":{"id":"comp4secAr2s25","component":4,"ticketOption":"2","eventID":"complexLocationTest","category":"2","name":"Row 3, Seat 26"},"comp4secAr2s26":{"id":"comp4secAr2s26","component":4,"ticketOption":"2","eventID":"complexLocationTest","category":"2","name":"Row 3, Seat 27"}}}
\ No newline at end of file