-
Notifications
You must be signed in to change notification settings - Fork 1
Login Refactor 1 #203
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
caleb-bit
wants to merge
9
commits into
main
Choose a base branch
from
Caleb/LoginRefactor
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Login Refactor 1 #203
Changes from 7 commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
a885feb
Initial login refactor
caleb-bit 6e81124
Merge branch 'main' into Caleb/LoginRefactor
caleb-bit 526b824
Merge branch 'main' of https://github.com/cuappdev/eatery-blue-androi…
caleb-bit 900f4b5
Initial login route refactor
caleb-bit 890cafa
Merge branch 'main' of https://github.com/cuappdev/eatery-blue-androi…
caleb-bit 1e1529d
Remove netID from settings
caleb-bit 44a3e15
Implement transactions retrieval plus internal refactoring
caleb-bit 3e6528a
Fix exposed loadedUser variable, use firstOrNull, plus other minor fi…
caleb-bit 8aebb23
Initial migration to new backend
caleb-bit File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
8 changes: 8 additions & 0 deletions
8
app/src/main/java/com/cornellappdev/android/eatery/data/models/AccountBalances.kt
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,8 @@ | ||
| package com.cornellappdev.android.eatery.data.models | ||
|
|
||
| data class AccountBalances( | ||
| val brbBalance: Double? = null, | ||
| val cityBucksBalance: Double? = null, | ||
| val laundryBalance: Double? = null, | ||
| val mealSwipes: Int? = null | ||
| ) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
94 changes: 63 additions & 31 deletions
94
app/src/main/java/com/cornellappdev/android/eatery/data/models/User.kt
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,74 +1,106 @@ | ||
| @file:Suppress("AddExplicitTargetToParameterAnnotation") | ||
|
|
||
| package com.cornellappdev.android.eatery.data.models | ||
|
|
||
| import com.squareup.moshi.Json | ||
| import com.squareup.moshi.JsonClass | ||
|
|
||
| @JsonClass(generateAdapter = true) | ||
| data class User( | ||
| @Json(name = "id") val id: String? = null, | ||
| @Json(name = "userName") val userName: String? = null, | ||
| @Json(name = "firstName") val firstName: String? = null, | ||
| @Json(name = "middleName") val middleName: String? = null, | ||
| @Json(name = "lastName") val lastName: String? = null, | ||
| @Json(name = "email") val email: String? = null, | ||
| @Json(name = "phone") val phone: String? = null, | ||
| var accounts: List<Account>? = null, | ||
| var transactions: List<Transaction>? = listOf() | ||
| @Json(name = "favorite_eateries") val favoriteEateries: List<Int> = emptyList(), | ||
| @Json(name = "favorite_items") val favoriteItems: List<String> = emptyList(), | ||
| @Json(name = "brb_balance") val brbBalance: Double = 0.0, | ||
| @Json(name = "city_bucks_balance") val cityBucksBalance: Double = 0.0, | ||
| @Json(name = "laundry_balance") val laundryBalance: Double = 0.0, | ||
| @Json(name = "transactions") val transactions: List<Transaction>? = listOf(), | ||
| @Json(name = "meal_swipes") val mealSwipes: Int? = null // todo - backend should make this | ||
| ) | ||
|
|
||
| @JsonClass(generateAdapter = true) | ||
| data class LoginRequest( | ||
| @Json(name = "device_id") val deviceId: String = "", | ||
| @Json(name = "fcm_token") val fcmToken: String = "", | ||
| @Json(name = "pin") val pin: Int = 0 | ||
| ) | ||
|
|
||
| @JsonClass(generateAdapter = true) | ||
| data class AuthorizedUser( | ||
| @Json(name = "id") val id: Long = 0, | ||
| @Json(name = "device_id") val deviceId: String = "", | ||
| @Json(name = "fcm_token") val fcmToken: String = "", | ||
| @Json(name = "pin") val pin: Int = 0 | ||
| ) | ||
|
|
||
| @JsonClass(generateAdapter = true) | ||
| data class AccountsResponse( | ||
| @Json(name = "accounts") val accounts: List<Account>? = null | ||
| data class Accounts( | ||
| @Json(name = "brb") val brbBalance: Account? = null, | ||
| @Json(name = "city_bucks") val cityBucksBalance: Account? = null, | ||
| @Json(name = "laundry") val laundryBalance: Account? = null | ||
| ) | ||
|
|
||
| @JsonClass(generateAdapter = true) | ||
| data class Account( | ||
| @Json(name = "accountDisplayName") val type: AccountType? = null, | ||
| @Json(name = "balance") val balance: Double? = null | ||
| @Json(name = "name") val name: String = "", | ||
| @Json(name = "balance") val balance: Double = 0.0 | ||
| ) | ||
|
|
||
| @JsonClass(generateAdapter = true) | ||
| data class TransactionsResponse( | ||
| @Json(name = "totalCount") val totalCount: Int? = null, | ||
| @Json(name = "returnCapped") val returnCapped: Boolean? = null, | ||
| @Json(name = "transactions") val transactions: List<Transaction>? = null | ||
| data class Transactions( | ||
| @Json(name = "transactions") val transactions: List<Transaction> = emptyList() | ||
| ) | ||
|
|
||
| @JsonClass(generateAdapter = true) | ||
| data class Transaction( | ||
| @Json(name = "transactionId") val id: String? = null, | ||
| @Json(name = "amount") val amount: Double? = null, | ||
| @Json(name = "resultingBalance") val resultingBalance: Double? = null, | ||
| @Json(name = "postedDate") val date: String? = null, | ||
| // make this TransactionType later | ||
| @Json(name = "transactionType") val transactionType: Int? = null, | ||
| @Json(name = "accountName") val accountType: AccountType? = null, | ||
| @Json(name = "locationName") val location: String? = null, | ||
| @Json(name = "amount") val amount: Double = 0.0, | ||
| @Json(name = "accountName") val accountType: AccountType = AccountType.OTHER, | ||
| @Json(name = "date") val date: String = "", | ||
| @Json(name = "location") val location: String = "", | ||
| @Json(name = "transactionType") val transactionType: TransactionType = TransactionType.NOOP // todo - backend should give this | ||
| ) | ||
|
|
||
| /** | ||
| * Categories for transactions used for filtering. More general than AccountType. | ||
| */ | ||
| enum class TransactionAccountType { | ||
| MEAL_SWIPES, | ||
| BRBS, | ||
| CITY_BUCKS, | ||
| LAUNDRY | ||
| } | ||
|
|
||
| /** | ||
| * Specific account types as they show up in the backend. | ||
| */ | ||
| enum class AccountType { | ||
| // MEALSWIPES is used for transaction history filtering, only. For anything else, use the actual | ||
| // meal plan types in the block below (OFF_CAMPUS, BEAR_TRADITIONAL, etc.). | ||
| LAUNDRY, | ||
| MEALSWIPES, | ||
| BRBS, | ||
| CITYBUCKS, | ||
| CITY_BUCKS, | ||
| OFF_CAMPUS, | ||
| BEAR_TRADITIONAL, | ||
| UNLIMITED, | ||
| BEAR_BASIC, | ||
| BEAR_CHOICE, | ||
| HOUSE_MEALPLAN, | ||
| HOUSE_MEAL_PLAN, | ||
| HOUSE_AFFILIATE, | ||
| FLEX, | ||
| JUST_BUCKS, | ||
| OTHER | ||
| // todo - are there more? | ||
| } | ||
|
|
||
| fun AccountType.toTransactionAccountType(): TransactionAccountType { | ||
| return when (this) { | ||
| AccountType.BRBS -> TransactionAccountType.BRBS | ||
| AccountType.CITY_BUCKS -> TransactionAccountType.CITY_BUCKS | ||
| AccountType.LAUNDRY -> TransactionAccountType.LAUNDRY | ||
| else -> TransactionAccountType.MEAL_SWIPES | ||
| } | ||
| } | ||
|
|
||
| enum class TransactionType(val value: Int) { | ||
| DEPOSIT(3), SPEND(1), NOOP(0), MISC(2); | ||
|
|
||
| companion object { | ||
| fun fromInt(value: Int) = values().first { it.value == value } | ||
| fun fromInt(value: Int) = TransactionType.entries.first { it.value == value } | ||
| } | ||
| } |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If there are methods that are completely unused, we can just get rid of them