Remove query & pagination-related internal code from public api package (#106)

Co-authored-by: Aleksandar Apostolov <[email protected]>

Author: gpunto

stream-feeds-android-client/src/main/kotlin/io/getstream/feeds/android/client/api/model/PaginationData.kt

@@ -15,8 +15,6 @@
  */
 package io.getstream.feeds.android.client.api.model
 
-import io.getstream.feeds.android.network.models.PagerResponse
-
 /**
  * Data class representing pagination information for a paginated response.
  *
@@ -33,19 +31,3 @@ public data class PaginationData(
         public val EMPTY: PaginationData = PaginationData()
     }
 }
-
-/**
- * Data class representing a paginated result containing a list of models and pagination data.
- *
- * @param T The type of the models in the list.
- * @property models The list of models in the paginated result.
- * @property pagination The pagination data for the result.
- */
-internal data class PaginationResult<T>(val models: List<T>, val pagination: PaginationData)
-
-/**
- * Extension function to convert a [PagerResponse] to a [PaginationData] model.
- *
- * @return A [PaginationData] instance containing the next and previous cursors.
- */
-internal fun PagerResponse.toModel(): PaginationData = PaginationData(next = next, previous = prev)

stream-feeds-android-client/src/main/kotlin/io/getstream/feeds/android/client/api/state/query/ActivitiesQuery.kt

@@ -17,14 +17,10 @@ package io.getstream.feeds.android.client.api.state.query
 
 import io.getstream.android.core.api.filter.Filter
 import io.getstream.android.core.api.filter.FilterField
-import io.getstream.android.core.api.filter.toRequest
 import io.getstream.android.core.api.sort.Sort
 import io.getstream.android.core.api.sort.SortDirection
 import io.getstream.android.core.api.sort.SortField
 import io.getstream.feeds.android.client.api.model.ActivityData
-import io.getstream.feeds.android.client.api.model.QueryConfiguration
-import io.getstream.feeds.android.client.internal.model.mapping.toRequest
-import io.getstream.feeds.android.network.models.QueryActivitiesRequest
 
 /**
  * A query for retrieving activities with filtering, sorting, and pagination options.
@@ -66,9 +62,6 @@ public data class ActivitiesQuery(
  */
 public typealias ActivitiesFilter = Filter<ActivityData, ActivitiesFilterField>
 
-internal typealias ActivitiesQueryConfig =
-    QueryConfiguration<ActivityData, ActivitiesFilterField, ActivitiesSort>
-
 /** Represents a field that can be used to filter activities. */
 public data class ActivitiesFilterField(
     override val remote: String,
@@ -202,13 +195,3 @@ public sealed interface ActivitiesSortField : SortField<ActivityData> {
         ActivitiesSortField,
         SortField<ActivityData> by SortField.create("popularity", ActivityData::popularity)
 }
-
-/** Converts the [ActivitiesQuery] to a [QueryActivitiesRequest]. */
-internal fun ActivitiesQuery.toRequest(): QueryActivitiesRequest =
-    QueryActivitiesRequest(
-        filter = filter?.toRequest(),
-        sort = sort?.map { it.toRequest() },
-        limit = limit,
-        next = next,
-        prev = previous,
-    )

stream-feeds-android-client/src/main/kotlin/io/getstream/feeds/android/client/api/state/query/ActivityReactionsQuery.kt

@@ -17,14 +17,10 @@ package io.getstream.feeds.android.client.api.state.query
 
 import io.getstream.android.core.api.filter.Filter
 import io.getstream.android.core.api.filter.FilterField
-import io.getstream.android.core.api.filter.toRequest
 import io.getstream.android.core.api.sort.Sort
 import io.getstream.android.core.api.sort.SortDirection
 import io.getstream.android.core.api.sort.SortField
 import io.getstream.feeds.android.client.api.model.FeedsReactionData
-import io.getstream.feeds.android.client.api.model.QueryConfiguration
-import io.getstream.feeds.android.client.internal.model.mapping.toRequest
-import io.getstream.feeds.android.network.models.QueryActivityReactionsRequest
 
 /**
  * A query for retrieving activity reactions with filtering, sorting, and pagination options.
@@ -60,9 +56,6 @@ public data class ActivityReactionsQuery(
  */
 public typealias ActivityReactionsFilter = Filter<FeedsReactionData, ActivityReactionsFilterField>
 
-internal typealias ActivityReactionsQueryConfig =
-    QueryConfiguration<FeedsReactionData, ActivityReactionsFilterField, ActivityReactionsSort>
-
 /** Represents a field that can be used to filter activity reactions. */
 public data class ActivityReactionsFilterField(
     override val remote: String,
@@ -147,11 +140,3 @@ public sealed interface ActivityReactionsSortField : SortField<FeedsReactionData
  *
  * @return A [QueryActivityReactionsRequest] containing the same parameters as this query.
  */
-internal fun ActivityReactionsQuery.toRequest(): QueryActivityReactionsRequest =
-    QueryActivityReactionsRequest(
-        filter = filter?.toRequest(),
-        limit = limit,
-        next = next,
-        prev = previous,
-        sort = sort?.map { it.toRequest() },
-    )

stream-feeds-android-client/src/main/kotlin/io/getstream/feeds/android/client/api/state/query/BookmarkFoldersQuery.kt

@@ -17,14 +17,10 @@ package io.getstream.feeds.android.client.api.state.query
 
 import io.getstream.android.core.api.filter.Filter
 import io.getstream.android.core.api.filter.FilterField
-import io.getstream.android.core.api.filter.toRequest
 import io.getstream.android.core.api.sort.Sort
 import io.getstream.android.core.api.sort.SortDirection
 import io.getstream.android.core.api.sort.SortField
 import io.getstream.feeds.android.client.api.model.BookmarkFolderData
-import io.getstream.feeds.android.client.api.model.QueryConfiguration
-import io.getstream.feeds.android.client.internal.model.mapping.toRequest
-import io.getstream.feeds.android.network.models.QueryBookmarkFoldersRequest
 
 /**
  * A query for retrieving bookmark folders with filtering, sorting, and pagination options.
@@ -58,9 +54,6 @@ public data class BookmarkFoldersQuery(
  */
 public typealias BookmarkFoldersFilter = Filter<BookmarkFolderData, BookmarkFoldersFilterField>
 
-internal typealias BookmarkFoldersQueryConfig =
-    QueryConfiguration<BookmarkFolderData, BookmarkFoldersFilterField, BookmarkFoldersSort>
-
 /** Represents a field that can be used to filter bookmark folders. */
 public data class BookmarkFoldersFilterField(
     override val remote: String,
@@ -145,14 +138,3 @@ public sealed interface BookmarkFoldersSortField : SortField<BookmarkFolderData>
             BookmarkFolderData::updatedAt,
         )
 }
-
-/** Converts the [BookmarkFoldersQuery] to a [QueryBookmarkFoldersRequest]. */
-internal fun BookmarkFoldersQuery.toRequest(): QueryBookmarkFoldersRequest {
-    return QueryBookmarkFoldersRequest(
-        filter = filter?.toRequest(),
-        sort = sort?.map { it.toRequest() },
-        limit = limit,
-        next = next,
-        prev = previous,
-    )
-}

stream-feeds-android-client/src/main/kotlin/io/getstream/feeds/android/client/api/state/query/BookmarksQuery.kt

@@ -17,14 +17,10 @@ package io.getstream.feeds.android.client.api.state.query
 
 import io.getstream.android.core.api.filter.Filter
 import io.getstream.android.core.api.filter.FilterField
-import io.getstream.android.core.api.filter.toRequest
 import io.getstream.android.core.api.sort.Sort
 import io.getstream.android.core.api.sort.SortDirection
 import io.getstream.android.core.api.sort.SortField
 import io.getstream.feeds.android.client.api.model.BookmarkData
-import io.getstream.feeds.android.client.api.model.QueryConfiguration
-import io.getstream.feeds.android.client.internal.model.mapping.toRequest
-import io.getstream.feeds.android.network.models.QueryBookmarksRequest
 
 /**
  * A query for retrieving bookmarks with filtering, sorting, and pagination options.
@@ -57,9 +53,6 @@ public data class BookmarksQuery(
  */
 public typealias BookmarksFilter = Filter<BookmarkData, BookmarksFilterField>
 
-internal typealias BookmarksQueryConfig =
-    QueryConfiguration<BookmarkData, BookmarksFilterField, BookmarksSort>
-
 /** Represents a field that can be used to filter bookmarks. */
 public data class BookmarksFilterField(
     override val remote: String,
@@ -153,14 +146,3 @@ public sealed interface BookmarksSortField : SortField<BookmarkData> {
         BookmarksSortField,
         SortField<BookmarkData> by SortField.create("updated_at", BookmarkData::updatedAt)
 }
-
-/** Converts the [BookmarksQuery] to a [QueryBookmarksRequest]. */
-internal fun BookmarksQuery.toRequest(): QueryBookmarksRequest {
-    return QueryBookmarksRequest(
-        filter = filter?.toRequest(),
-        sort = sort?.map { it.toRequest() },
-        limit = limit,
-        next = next,
-        prev = previous,
-    )
-}

stream-feeds-android-client/src/main/kotlin/io/getstream/feeds/android/client/api/state/query/CommentReactionsQuery.kt

@@ -17,14 +17,10 @@ package io.getstream.feeds.android.client.api.state.query
 
 import io.getstream.android.core.api.filter.Filter
 import io.getstream.android.core.api.filter.FilterField
-import io.getstream.android.core.api.filter.toRequest
 import io.getstream.android.core.api.sort.Sort
 import io.getstream.android.core.api.sort.SortDirection
 import io.getstream.android.core.api.sort.SortField
 import io.getstream.feeds.android.client.api.model.FeedsReactionData
-import io.getstream.feeds.android.client.api.model.QueryConfiguration
-import io.getstream.feeds.android.client.internal.model.mapping.toRequest
-import io.getstream.feeds.android.network.models.QueryCommentReactionsRequest
 
 /**
  * A query configuration for fetching reactions for a specific comment.
@@ -65,9 +61,6 @@ public data class CommentReactionsQuery(
  */
 public typealias CommentReactionsFilter = Filter<FeedsReactionData, CommentReactionsFilterField>
 
-internal typealias CommentReactionsQueryConfig =
-    QueryConfiguration<FeedsReactionData, CommentReactionsFilterField, CommentReactionsSort>
-
 /** Represents a field that can be used to filter comment reactions. */
 public data class CommentReactionsFilterField(
     override val remote: String,
@@ -136,11 +129,3 @@ public sealed interface CommentReactionSortField : SortField<FeedsReactionData>
 }
 
 /** Converts a [CommentReactionsQuery] to the corresponding [QueryCommentReactionsRequest]. */
-internal fun CommentReactionsQuery.toRequest(): QueryCommentReactionsRequest =
-    QueryCommentReactionsRequest(
-        filter = filter?.toRequest(),
-        limit = limit,
-        next = next,
-        prev = previous,
-        sort = sort?.map { it.toRequest() },
-    )

stream-feeds-android-client/src/main/kotlin/io/getstream/feeds/android/client/api/state/query/CommentsQuery.kt

@@ -17,9 +17,7 @@ package io.getstream.feeds.android.client.api.state.query
 
 import io.getstream.android.core.api.filter.Filter
 import io.getstream.android.core.api.filter.FilterField
-import io.getstream.android.core.api.filter.toRequest
 import io.getstream.feeds.android.client.api.model.CommentData
-import io.getstream.feeds.android.network.models.QueryCommentsRequest
 import java.util.Date
 
 /**
@@ -210,49 +208,9 @@ public sealed interface CommentsSort {
     public data object Top : CommentsSort
 }
 
-/** Converts a [CommentsQuery] to the corresponding [QueryCommentsRequest]. */
-internal fun CommentsQuery.toRequest(): QueryCommentsRequest =
-    QueryCommentsRequest(
-        filter = filter?.toRequest().orEmpty(),
-        limit = limit,
-        next = next,
-        prev = previous,
-        sort = sort?.toRequest(),
-    )
-
-/**
- * Converts a [CommentsSort] to the corresponding [QueryCommentsRequest.Sort].
- *
- * @return The [QueryCommentsRequest.Sort] representation of this [CommentsSort].
- */
-internal fun CommentsSort.toRequest(): QueryCommentsRequest.Sort =
-    when (this) {
-        CommentsSort.Best -> QueryCommentsRequest.Sort.Best
-        CommentsSort.Controversial -> QueryCommentsRequest.Sort.Controversial
-        CommentsSort.First -> QueryCommentsRequest.Sort.First
-        CommentsSort.Last -> QueryCommentsRequest.Sort.Last
-        CommentsSort.Top -> QueryCommentsRequest.Sort.Top
-    }
-
 internal interface CommentsSortDataFields {
     val createdAt: Date
     val confidenceScore: Float
     val controversyScore: Float?
     val score: Int
 }
-
-internal fun CommentsSort?.toComparator(): Comparator<CommentsSortDataFields> =
-    when (this) {
-        CommentsSort.Top ->
-            compareByDescending(CommentsSortDataFields::score)
-                .thenByDescending(CommentsSortDataFields::createdAt)
-
-        CommentsSort.Best ->
-            compareByDescending(CommentsSortDataFields::confidenceScore)
-                .thenByDescending(CommentsSortDataFields::createdAt)
-
-        CommentsSort.Controversial -> compareByDescending { it.controversyScore ?: -1f }
-        CommentsSort.First -> compareBy(CommentsSortDataFields::createdAt)
-        CommentsSort.Last,
-        null -> compareByDescending(CommentsSortDataFields::createdAt)
-    }

stream-feeds-android-client/src/main/kotlin/io/getstream/feeds/android/client/api/state/query/FeedQuery.kt

@@ -15,12 +15,8 @@
  */
 package io.getstream.feeds.android.client.api.state.query
 
-import io.getstream.android.core.api.filter.toRequest
 import io.getstream.feeds.android.client.api.model.FeedId
 import io.getstream.feeds.android.client.api.model.FeedInputData
-import io.getstream.feeds.android.client.api.model.toRequest
-import io.getstream.feeds.android.network.models.GetOrCreateFeedRequest
-import io.getstream.feeds.android.network.models.PagerRequest
 
 /**
  * A query configuration for retrieving and managing feed data from Stream feeds.
@@ -112,25 +108,3 @@ public data class FeedQuery(
         watch = watch,
     )
 }
-
-/**
- * Converts this [FeedQuery] to a [GetOrCreateFeedRequest].
- *
- * @return A [GetOrCreateFeedRequest] representing the feed query.
- */
-internal fun FeedQuery.toRequest(): GetOrCreateFeedRequest =
-    GetOrCreateFeedRequest(
-        limit = activityLimit,
-        next = activityNext,
-        prev = activityPrevious,
-        view = view,
-        watch = watch,
-        activitySelectorOptions = activitySelectorOptions,
-        data = data?.toRequest(),
-        externalRanking = externalRanking,
-        filter = activityFilter?.toRequest(),
-        followersPagination = followerLimit?.let { PagerRequest(it) },
-        followingPagination = followingLimit?.let { PagerRequest(it) },
-        interestWeights = interestWeights,
-        memberPagination = memberLimit?.let { PagerRequest(it) },
-    )

stream-feeds-android-client/src/main/kotlin/io/getstream/feeds/android/client/api/state/query/FeedsQuery.kt

@@ -17,15 +17,11 @@ package io.getstream.feeds.android.client.api.state.query
 
 import io.getstream.android.core.api.filter.Filter
 import io.getstream.android.core.api.filter.FilterField
-import io.getstream.android.core.api.filter.toRequest
 import io.getstream.android.core.api.sort.Sort
 import io.getstream.android.core.api.sort.SortDirection
 import io.getstream.android.core.api.sort.SortField
 import io.getstream.feeds.android.client.api.model.FeedData
-import io.getstream.feeds.android.client.api.model.QueryConfiguration
-import io.getstream.feeds.android.client.internal.model.mapping.toRequest
 import io.getstream.feeds.android.client.internal.state.query.unsupportedLocalValue
-import io.getstream.feeds.android.network.models.QueryFeedsRequest
 
 /**
  * A query for retrieving feeds with filtering, sorting, and pagination options.
@@ -68,8 +64,6 @@ public data class FeedsQuery(
 /** A type alias representing a filter specifically for [FeedData] using [FeedsFilterField]. */
 public typealias FeedsFilter = Filter<FeedData, FeedsFilterField>
 
-internal typealias FeedsQueryConfig = QueryConfiguration<FeedData, FeedsFilterField, FeedsSort>
-
 /** Represents a field that can be used to filter feeds. */
 public data class FeedsFilterField(
     override val remote: String,
@@ -275,21 +269,3 @@ public sealed interface FeedsSortField : SortField<FeedData> {
         FeedsSortField,
         SortField<FeedData> by SortField.create("following_count", FeedData::followingCount)
 }
-
-/**
- * Converts the [FeedsQuery] to a [QueryFeedsRequest].
- *
- * This function maps the properties of the [FeedsQuery] to the corresponding fields in the
- * [QueryFeedsRequest], allowing it to be used in API requests.
- *
- * @return A [QueryFeedsRequest] object with the properties from this query.
- */
-internal fun FeedsQuery.toRequest(): QueryFeedsRequest =
-    QueryFeedsRequest(
-        limit = limit,
-        next = next,
-        prev = previous,
-        watch = watch,
-        sort = sort?.map { it.toRequest() },
-        filter = filter?.toRequest(),
-    )