Skip to content

[MS-537] The 'expiration' field in the 'License' class is now nullable to reflect the BFSID API #773

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.

Sign up for GitHub

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

Merged
alexandr-simprints merged 1 commit into from
Jun 27, 2024
Merged

[MS-537] The 'expiration' field in the 'License' class is now nullable to reflect the BFSID API #773

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion infra/license/src/main/java/com/simprints/infra/license/LicenseUtils.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import java.util.TimeZone


private fun License.isExpired(): Boolean {
if (expiration.isEmpty()) return false
if (expiration.isNullOrEmpty()) return false

val format = SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'", Locale.US)
format.timeZone = TimeZone.getTimeZone("UTC")
Expand Down
2 changes: 1 addition & 1 deletion infra/license/src/main/java/com/simprints/infra/license/local/LicenseLocalDataSourceImpl.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ internal class LicenseLocalDataSourceImpl @Inject constructor(
withContext(dispatcherIo) {
createDirectoryIfNonExistent(licenseDirectoryPath)
saveLicenseData(vendor, license.data)
saveExpirationDate(vendor, license.expiration)
license.expiration?.let { saveExpirationDate(vendor, it) }
}

private fun saveLicenseData(vendor: Vendor, licenseData: String) {
Expand Down
2 changes: 1 addition & 1 deletion infra/license/src/main/java/com/simprints/infra/license/remote/ApiLicense.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ internal data class ApiLicense(val licenses: Map<Vendor, License> = emptyMap())
}

@Keep
data class License(val expiration: String, val data: String)
data class License(val expiration: String?, val data: String)

/**
* BFSID returns an error in the following format:
Expand Down
13 changes: 8 additions & 5 deletions infra/license/src/test/java/com/simprints/infra/license/LicenseUtilsTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,19 +12,22 @@ class LicenseUtilsTest {
val nullLicense: License? = null
assertThat(nullLicense.determineLicenseStatus()).isEqualTo(LicenseStatus.MISSING)

val expiredLicense = License("2022-01-01T00:00:00Z", "data")
val expiredLicense = License(expiration = "2022-01-01T00:00:00Z", data = "data")
assertThat(expiredLicense.determineLicenseStatus()).isEqualTo(LicenseStatus.EXPIRED)

val invalidLicense = License("2223-01-01T00:00:00Z", "")
val invalidLicense = License(expiration = "2223-01-01T00:00:00Z", data = "")
assertThat(invalidLicense.determineLicenseStatus()).isEqualTo(LicenseStatus.INVALID)

val validLicense = License("2123-01-01T00:00:00Z", "data")
val validLicense = License(expiration = "2123-01-01T00:00:00Z", data = "data")
assertThat(validLicense.determineLicenseStatus()).isEqualTo(LicenseStatus.VALID)

val validLicenseWithEmptyExpiration = License("", "data")
val validLicenseWithEmptyExpiration = License(expiration = "", data = "data")
assertThat(validLicenseWithEmptyExpiration.determineLicenseStatus()).isEqualTo(LicenseStatus.VALID)

val validLicenseWithBadExpirationDate = License("bad date", "data")
val validLicenseWithNullExpiration = License(expiration = null, data = "data")
assertThat(validLicenseWithNullExpiration.determineLicenseStatus()).isEqualTo(LicenseStatus.VALID)

val validLicenseWithBadExpirationDate = License(expiration = "bad date", data = "data")
assertThat(validLicenseWithBadExpirationDate.determineLicenseStatus()).isEqualTo(
LicenseStatus.VALID
)
Expand Down