feat: add ooni test descriptors. #275
Conversation
There was a problem hiding this comment.
I feel we should remove Defaults descriptors all together. If we don't have them anymore, we don't need the extra complexity. That means:
- No need to keep both
DescriptorandInstalledTestDescriptorModelclasses Descriptor.Sourceis not neededDefaultTestDescriptoris not neededGetDefaultTestDescriptorsis not needed- Only
isDefault()method is needed, theisInstalledNonDefaultDescriptor()should just be!isDefault().
That should simplify a lot of the existing code.
| @@ -53,6 +58,21 @@ data class InstalledTestDescriptorModel( | |||
|
|
|||
| val isExpired get() = expirationDate != null && expirationDate < LocalDateTime.now() | |||
|
|
|||
| val isDefaultTestDescriptor get() = id.value in 10470..10474 // TODO(aanorbel): switch to OONI reserved namespace | |||
|
|
|||
| val key get() = if (isDefaultTestDescriptor) { | |||
There was a problem hiding this comment.
This is more like a settings key now no? Just to make it clear why we still need this. Because for all other purposes now we can use the ID.
Maybe we can keep both Descriptor and InstalledTestDescriptorModel. It may be useful for the |
| } | ||
| } | ||
| companion object { | ||
| fun fromDescriptor(descriptor: Descriptor) = descriptor.source.id |
There was a problem hiding this comment.
This companion object isn't needed, it should return an object of the type Test, or it should be called something like sourceFromDescriptor. It's weird that a static factory method only returns a specific field inside its class.
| @@ -17,24 +17,11 @@ sealed interface RunSpecification { | |||
|
|
|||
| @Serializable | |||
| data class Test( | |||
| val source: Source, | |||
| val source: InstalledTestDescriptorModel.Id? = null, | |||
There was a problem hiding this comment.
Maybe call this sourceId or descriptorId to avoid confusion?
There was a problem hiding this comment.
And this should never be null right?
| @@ -104,7 +104,6 @@ class ChooseWebsitesViewModel( | |||
| RunSpecification.Full( | |||
| tests = listOf( | |||
| RunSpecification.Test( | |||
| source = RunSpecification.Test.Source.Default("websites"), | |||
There was a problem hiding this comment.
We should fetch it from the DB, or hardcode the websites descriptor ID somewhere.
There was a problem hiding this comment.
Is this is empty, it can be removed no?
| @@ -52,6 +72,10 @@ data class InstalledTestDescriptorModel( | |||
|
|
|||
| val isExpired get() = expirationDate != null && expirationDate < LocalDateTime.now() | |||
|
|
|||
| val isDefaultTestDescriptor get() = id.value in 10470..10474 // TODO(aanorbel): switch to OONI reserved namespace | |||
There was a problem hiding this comment.
We could also check if they are in OoniTest now.
|
This will be done eventually but converting to draft for now. https://openobservatory.slack.com/archives/GKGRFHXT7/p1733782481912289?thread_ts=1733329764.355889&cid=GKGRFHXT7 |
Closes #173, #174