Skip to content

DROID-3167 Date as an Object | Exclude all object which were not created by space members #1911

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
konstantiniiv merged 1 commit into from
Dec 12, 2024
Merged

DROID-3167 Date as an Object | Exclude all object which were not created by space members #1911

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
51 changes: 37 additions & 14 deletions feature-date/src/main/java/com/anytypeio/anytype/feature_date/viewmodel/SearchParams.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@ import com.anytypeio.anytype.core_models.ObjectTypeUniqueKeys
import com.anytypeio.anytype.core_models.Relation
import com.anytypeio.anytype.core_models.RelationFormat
import com.anytypeio.anytype.core_models.Relations
import com.anytypeio.anytype.core_models.Relations.LAST_MODIFIED_DATE
import com.anytypeio.anytype.core_models.Relations.RELATION_KEY
import com.anytypeio.anytype.core_models.Relations.TYPE
import com.anytypeio.anytype.core_models.TimeInSeconds

fun filtersAndSortsForSearch(
Expand All @@ -21,8 +24,8 @@ fun filtersAndSortsForSearch(
addAll(buildDeletedFilter())
add(buildSpaceIdFilter(spaces))
add(buildTemplateFilter())
add(
buildFieldFilter(
addAll(
buildFieldFilters(
dateObjectId = dateId,
field = field,
timestamp = timestamp
Expand All @@ -45,31 +48,51 @@ private fun buildSorts(
)
}

private fun buildFieldFilter(
private fun buildFieldFilters(
dateObjectId: Id,
field: ActiveField,
timestamp: TimeInSeconds
): DVFilter {
): List<DVFilter> {
val fieldKey = field.key.key
return when (field.format) {
Relation.Format.DATE -> {
DVFilter(
relation = fieldKey,
condition = DVFilterCondition.EQUAL,
value = timestamp.toDouble(),
relationFormat = RelationFormat.DATE
)
buildList {
add(
DVFilter(
relation = fieldKey,
condition = DVFilterCondition.EQUAL,
value = timestamp.toDouble(),
relationFormat = RelationFormat.DATE
)
)
if (fieldKey == LAST_MODIFIED_DATE) {
add(
DVFilter(
relation = Relations.CREATED_DATE,
condition = DVFilterCondition.NOT_EQUAL,
value = mapOf(
RELATION_KEY to fieldKey,
TYPE to VALUE_FROM_RELATION
)
)
)
}
}
}
else -> {
DVFilter(
relation = fieldKey,
condition = DVFilterCondition.IN,
value = dateObjectId
listOf(
DVFilter(
relation = fieldKey,
condition = DVFilterCondition.IN,
value = dateObjectId
)
)
}
}
}

const val VALUE_FROM_RELATION = "valueFromRelation"

private fun buildTemplateFilter(): DVFilter = DVFilter(
relation = Relations.TYPE_UNIQUE_KEY,
condition = DVFilterCondition.NOT_EQUAL,
Expand Down
Loading