fixed all scanner endpoints and functionality, along with fully finis…

…hed home page

app/src/main/java/org/hackillinois/android/API.kt

@@ -9,6 +9,7 @@ import org.hackillinois.android.model.scanner.DietaryRestrictions
 import org.hackillinois.android.model.scanner.EventId
 import org.hackillinois.android.model.scanner.MentorId
 import org.hackillinois.android.model.scanner.Points
+import org.hackillinois.android.model.scanner.QRCode
 import org.hackillinois.android.model.scanner.UserEventPair
 import org.hackillinois.android.model.shop.ItemInstance
 import org.hackillinois.android.model.user.FavoritesResponse
@@ -68,6 +69,9 @@ interface API {
     @POST("shop/item/buy/")
     suspend fun buyShopItem(@Body body: ItemInstance): ShopItem
 
+    @POST("shop/cart/redeem/")
+    suspend fun redeemCart(@Body body: QRCode) : Cart
+
     // STAFF
 
     @POST("staff/attendance/")

app/src/main/java/org/hackillinois/android/database/entity/Cart.kt

@@ -0,0 +1,10 @@
+package org.hackillinois.android.database.entity
+
+import androidx.room.Entity
+import androidx.room.PrimaryKey
+
+@Entity(tableName = "cart")
+data class Cart(
+    @PrimaryKey val userId: String,
+    val items: Map<String, Int> // Maps itemId to quantity
+)

app/src/main/java/org/hackillinois/android/model/scanner/QRCode.kt

@@ -0,0 +1,3 @@
+package org.hackillinois.android.model.scanner
+
+data class QRCode(val QRCode: String)

app/src/main/java/org/hackillinois/android/model/scanner/UserEventPair.kt

@@ -1,3 +1,3 @@
 package org.hackillinois.android.model.scanner
 
-data class UserEventPair(val attendeeJWT: String, val eventId: String)
+data class UserEventPair(val eventId: String, val attendeeQRCode: String)

app/src/main/java/org/hackillinois/android/view/home/EventProgressManager.kt

@@ -9,50 +9,50 @@ import java.util.*
 class EventProgressManager(val listener: CountDownListener) {
 
     // CORRECT TIMES ARE NOT SET YET
-    // 02-28-2025 :00:00
+    // 02-28-2025 : 14:30
     private val checkInTime: Calendar = Calendar.getInstance().apply {
         timeZone = TimeZone.getTimeZone("America/Chicago")
-        timeInMillis = 1708723800000
+        timeInMillis = 1740774600000
     }
 
-    // 02-23-2024 16:00:00
+    // 02-28-2025 : 15:00
     private val scavengerHuntTime: Calendar = Calendar.getInstance().apply {
         timeZone = TimeZone.getTimeZone("America/Chicago")
-        timeInMillis = 1708725600000
+        timeInMillis = 1740776400000
     }
 
-    // 02-23-2024 18:00:00
+    // 02-28-2025 : 17:00
     private val openingCeremonyTime: Calendar = Calendar.getInstance().apply {
         timeZone = TimeZone.getTimeZone("America/Chicago")
-        timeInMillis = 1708732800000
+        timeInMillis = 1740783600000
     }
 
-    // 02-23-2024 19:00:00
+    // 02-28-2025 : 18:00
     private val hackingTime: Calendar = Calendar.getInstance().apply {
         timeZone = TimeZone.getTimeZone("America/Chicago")
-        timeInMillis = 1708736400000
+        timeInMillis = 1740787200000
     }
 
-    // 02-25-2024 11:00:00
+    // 03-02-2025 11:30
     private val projectShowcaseTime: Calendar = Calendar.getInstance().apply {
         timeZone = TimeZone.getTimeZone("America/Chicago")
-        timeInMillis = 1708880400000
+        timeInMillis = 1740936600000
     }
 
-    // 02-25-2024 15:00:00
+    // 03-02-2025 15:00
     private val closingCeremonyTime: Calendar = Calendar.getInstance().apply {
         timeZone = TimeZone.getTimeZone("America/Chicago")
-        timeInMillis = 1708894800000
+        timeInMillis = 1740949200000
     }
 
-    // 02-25-2024 16:00:00
+    // 03-02-2025 16:00
     private val afterHackathonTime: Calendar = Calendar.getInstance().apply {
         timeZone = TimeZone.getTimeZone("America/Chicago")
-        timeInMillis = 1708898400000
+        timeInMillis = 1740952800000
     }
 
     private var times = listOf(checkInTime, scavengerHuntTime, openingCeremonyTime, hackingTime, projectShowcaseTime, closingCeremonyTime, afterHackathonTime)
-    private var backgrounds = listOf(R.drawable.home_stage0_svg, R.drawable.home_check_in_bg, R.drawable.home_scavenger_hunt_bg, R.drawable.home_opening_bg, R.drawable.home_hacking_bg, R.drawable.home_project_showcase_bg, R.drawable.home_closing_bg, R.drawable.home_final_bg)
+    private var backgrounds = listOf(R.drawable.home_background1_svg, R.drawable.home_background2_svg, R.drawable.home_background3_svg, R.drawable.home_background3_svg, R.drawable.home_background4_svg, R.drawable.home_background5_svg, R.drawable.home_background6_svg, R.drawable.home_background6_svg)
     private var timer: CountDownTimer? = null
     private var state = 0
 

app/src/main/java/org/hackillinois/android/view/profile/ProfileFragment.kt

@@ -4,6 +4,7 @@ import android.content.Context
 import android.graphics.Bitmap
 import android.graphics.Color
 import android.os.Bundle
+import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -159,6 +160,7 @@ class ProfileFragment : Fragment() {
         if (qrCodeImage.width > 0 && qrCodeImage.height > 0) {
             // Retrieves qr code user info that will be encoded
             val text = qr.qrInfo
+            Log.d("Attendee QR Code: ", ""+text)
             // Creates bitmap of text
             val bitmap = generateQR(text)
             // actually setting the qr code to be the generated qr code

app/src/main/java/org/hackillinois/android/view/scanner/AttendeeScannerFragment.kt

@@ -41,16 +41,7 @@ class AttendeeScannerFragment : Fragment() {
             (context as MainActivity).switchFragment(scannerFragment, true)
         }
 
-        // when point shop button is clicked
-//        val pointShopButton = view.findViewById<Button>(R.id.pointShopBtn)
-//        pointShopButton.setOnClickListener {
-//            if (appBar != null && scannerBtn != null) {
-//                appBar.visibility = View.INVISIBLE
-//                scannerBtn.visibility = View.INVISIBLE
-//            }
-//            val scannerFragment = ScannerFragment.newInstance("point-shop")
-//            (context as MainActivity).switchFragment(scannerFragment, true)
-//        }
+
 
         return view
     }

app/src/main/java/org/hackillinois/android/view/scanner/ScannerFragment.kt

@@ -8,6 +8,7 @@ import android.os.Build
 import android.os.Bundle
 import android.os.Handler
 import android.os.Looper
+import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -34,6 +35,7 @@ import org.hackillinois.android.model.scanner.EventId
 import org.hackillinois.android.model.scanner.MentorId
 import org.hackillinois.android.model.scanner.ScanStatus
 import org.hackillinois.android.model.scanner.UserEventPair
+import org.hackillinois.android.model.scanner.QRCode
 import org.hackillinois.android.model.shop.ItemInstance
 import org.hackillinois.android.viewmodel.ScannerViewModel
 
@@ -128,9 +130,11 @@ class ScannerFragment : Fragment(), SimpleScanDialogFragment.OnSimpleOKButtonSel
                                 viewModel.submitMeetingAttendance(EventId(eventId))
                             }
                             "attendee-check-in" -> {
+                                Log.d("Attendee Code: ", "" + it.text)
                                 val userToken = extractUserToken(it.text)
+                                Log.d("User Token: ", userToken)
                                 val eventId = getChipEventId()
-                                viewModel.checkInAttendee(UserEventPair(userToken, eventId))
+                                viewModel.checkInAttendee(UserEventPair(eventId, userToken))
                             }
                             else -> {
                                 displayToast(R.string.something_went_wrong_message)
@@ -146,11 +150,14 @@ class ScannerFragment : Fragment(), SimpleScanDialogFragment.OnSimpleOKButtonSel
                             }
                             "mentor-check-in" -> {
                                 val mentorId: String = it.text
+                                Log.d("Mentor Text: ", "" + mentorId)
                                 viewModel.checkInMentor(MentorId(mentorId))
                             }
                             "point-shop" -> {
-                                val itemInstance = extractItemInfo(it.text)
-                                viewModel.purchaseItem(itemInstance)
+                                Log.d("Shop Raw Text: ", "" + it.text)
+                                val QRCode: String = it.text
+                                Log.d("Point Text: ", QRCode)
+                                viewModel.redeemAttendeeCart(QRCode(QRCode))
                             }
                             else -> {
                                 displayToast(R.string.something_went_wrong_message)
@@ -257,8 +264,11 @@ class ScannerFragment : Fragment(), SimpleScanDialogFragment.OnSimpleOKButtonSel
     }
 
     private fun extractUserToken(qrString: String): String {
-        val splitOnEquals = qrString.split("=")
-        return splitOnEquals.last()
+//        val splitOnEquals = qrString.split("=")
+//        return splitOnEquals.last()
+        val uri = Uri.parse(qrString)
+        val encodedQuery = uri.encodedQuery ?: return ""
+        return encodedQuery.substringAfter("qr=")
     }
 
     private fun extractItemInfo(qrString: String): ItemInstance {
@@ -270,7 +280,7 @@ class ScannerFragment : Fragment(), SimpleScanDialogFragment.OnSimpleOKButtonSel
     }
 
     private fun getChipEventId(): String {
-        return chipIdToEventId[chipGroup.checkedChipId] ?: "ca7927242bcf76b9ee8c5e210a587a98" // default to check-in TODO: update every year
+        return chipIdToEventId[chipGroup.checkedChipId] ?: "728eeef366eea4ba1702c4d74a1b8915" // default to check-in TODO: update every year
     }
 
     private fun displayStaffScanResult(lastScanStatus: ScanStatus?) = lastScanStatus?.let {

app/src/main/java/org/hackillinois/android/view/scanner/StaffScannerFragment.kt

@@ -41,6 +41,16 @@ class StaffScannerFragment : Fragment() {
             (context as MainActivity).switchFragment(scannerFragment, true)
         }
 
+        val pointShopButton = view.findViewById<Button>(R.id.pointShopBtn)
+        pointShopButton.setOnClickListener {
+            if (appBar != null && scannerBtn != null) {
+                appBar.visibility = View.INVISIBLE
+                scannerBtn.visibility = View.INVISIBLE
+            }
+            val scannerFragment = ScannerFragment.newInstance("point-shop")
+            (context as MainActivity).switchFragment(scannerFragment, true)
+        }
+
         return view
     }
 }

app/src/main/java/org/hackillinois/android/viewmodel/ScannerViewModel.kt

@@ -10,6 +10,7 @@ import org.hackillinois.android.model.scanner.EventId
 import org.hackillinois.android.model.scanner.MentorId
 import org.hackillinois.android.model.scanner.ScanStatus
 import org.hackillinois.android.model.scanner.UserEventPair
+import org.hackillinois.android.model.scanner.QRCode
 import org.hackillinois.android.model.shop.ItemInstance
 import org.hackillinois.android.repository.rolesRepository
 import org.json.JSONObject
@@ -46,6 +47,30 @@ class ScannerViewModel : ViewModel() {
                 Log.e("STAFF MEETING ERROR", error)
                 val scanStatus = ScanStatus("Scan failed: $error", false)
                 lastScanStatus.postValue(scanStatus)
+
+            }
+        }
+    }
+
+    fun redeemAttendeeCart(body : QRCode) {
+        viewModelScope.launch {
+            try {
+                App.getAPI().redeemCart(body)
+                val message = "Attendee successfully redeemed cart at Point Shop."
+                val scanStatus = ScanStatus(message, true)
+                lastScanStatus.postValue(scanStatus)
+            } catch (e: Exception) {
+                var error = e.message.toString()
+                try {
+                    if (e is HttpException) {
+                        val jsonObject = JSONObject("" + e.response()?.errorBody()?.string())
+                        error = jsonObject.optString("message", e.message.toString())
+                    }
+                } catch (e: Exception) { }
+                Log.e("Failed to redeem cart", error)
+                val scanStatus = ScanStatus("Scan failed: $error", false)
+                lastScanStatus.postValue(scanStatus)
+
             }
         }
     }
@@ -70,6 +95,7 @@ class ScannerViewModel : ViewModel() {
                 Log.e("CHECK IN ATTENDEE ERROR", error)
                 val scanStatus = ScanStatus("Scan failed: $error", false)
                 lastScanStatus.postValue(scanStatus)
+
             }
         }
     }
@@ -92,6 +118,7 @@ class ScannerViewModel : ViewModel() {
                 Log.e("CHECK IN EVENT ERROR", error)
                 val scanStatus = ScanStatus("Scan failed: $error", false)
                 lastScanStatus.postValue(scanStatus)
+
             }
         }
     }
@@ -114,6 +141,7 @@ class ScannerViewModel : ViewModel() {
                 Log.e("CHECK IN MENTOR ERROR", error)
                 val scanStatus = ScanStatus("Scan failed: $error", false)
                 lastScanStatus.postValue(scanStatus)
+
             }
         }
     }
@@ -133,10 +161,11 @@ class ScannerViewModel : ViewModel() {
                         val jsonObject = JSONObject("" + e.response()?.errorBody()?.string())
                         error = jsonObject.optString("message", e.message.toString())
                     }
-                } catch (e: Exception) { }
-                Log.e("PURCHASE ITEM ERROR", error)
-                val scanStatus = ScanStatus("Scan failed: $error", false)
-                lastScanStatus.postValue(scanStatus)
+                } catch (e: Exception) {
+                    Log.e("PURCHASE ITEM ERROR", error)
+                    val scanStatus = ScanStatus("Scan failed: $error", false)
+                    lastScanStatus.postValue(scanStatus)
+                }
             }
         }
     }