Skip to content

Commit

Permalink
Added missing sort keys.
Browse files Browse the repository at this point in the history 
Changes after review.
  • Loading branch information
@marcin-cebo
marcin-cebo committed Dec 4, 2024
1 parent 427052e commit 9fcf653
Show file tree
Hide file tree
Showing 10 changed files with 166 additions and 119 deletions.
6 changes: 5 additions & 1 deletion ...nub-gson-api/src/main/java/com/pubnub/api/java/endpoints/objects_api/utils/PNSortKey.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,11 @@ public enum Dir {
}

public enum Key {
ID("id"), NAME("name"), UPDATED("updated");
ID("id"),
NAME("name"),
UPDATED("updated"),
STATUS("status"),
TYPE("type");

@Getter(AccessLevel.PACKAGE)
private final String fieldName;
Expand Down
8 changes: 8 additions & 0 deletions ...src/integrationTest/java/com/pubnub/api/integration/objects/members/ChannelMembersIT.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import com.pubnub.api.PubNubException;
import com.pubnub.api.integration.objects.ObjectsApiBaseIT;
import com.pubnub.api.java.endpoints.objects_api.utils.PNSortKey;
import com.pubnub.api.java.models.consumer.objects_api.member.MemberInclude;
import com.pubnub.api.java.models.consumer.objects_api.member.PNGetChannelMembersResult;
import com.pubnub.api.java.models.consumer.objects_api.member.PNManageChannelMembersResult;
Expand Down Expand Up @@ -80,9 +81,13 @@ public void addChannelMembersHappyPath() throws PubNubException {
.includeUserStatus(true)
.includeUserType(true)
.build())
.sort(Arrays.asList(PNSortKey.asc(PNSortKey.Key.STATUS)))
.sync();

//then
assertEquals(STATUS_01, setChannelMembersResult.getData().get(0).getStatus().getValue());
assertEquals(STATUS_02, setChannelMembersResult.getData().get(1).getStatus().getValue());

assertNotNull(setChannelMembersResult);
assertEquals(HttpStatus.SC_OK, setChannelMembersResult.getStatus());
createdMembersList.add(setChannelMembersResult);
Expand Down Expand Up @@ -181,10 +186,13 @@ public void getChannelMembersHappyPath() throws PubNubException {
.includeUser(true)
.includeUserCustom(true)
.build())
.sort(Arrays.asList(PNSortKey.desc(PNSortKey.Key.STATUS)))
.sync();


//then
assertEquals(TYPE_01, getMembersResult.getData().get(1).getType().getValue());
assertEquals(TYPE_02, getMembersResult.getData().get(0).getType().getValue());
assertNotNull(getMembersResult);
assertEquals(HttpStatus.SC_OK, getMembersResult.getStatus());
PNMembers pnMember01 = getChannelMemberByUserId(getMembersResult, TEST_UUID1);
Expand Down
15 changes: 12 additions & 3 deletions ...src/integrationTest/java/com/pubnub/api/integration/objects/memberships/MembershipIT.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import com.pubnub.api.PubNubException;
import com.pubnub.api.integration.objects.ObjectsApiBaseIT;
import com.pubnub.api.java.endpoints.objects_api.utils.PNSortKey;
import com.pubnub.api.java.models.consumer.objects_api.membership.MembershipInclude;
import com.pubnub.api.java.models.consumer.objects_api.membership.PNChannelMembership;
import com.pubnub.api.java.models.consumer.objects_api.membership.PNGetMembershipsResult;
Expand Down Expand Up @@ -88,8 +89,12 @@ public void setMembershipsHappyPath() throws PubNubException {
.includeChannelType(true)
.includeChannelStatus(true)
.build())
.sort(Arrays.asList(PNSortKey.asc(PNSortKey.Key.STATUS)))
.sync();

assertEquals(membership01Status, setMembershipResult.getData().get(0).getStatus().getValue());
assertEquals(membership02Status, setMembershipResult.getData().get(1).getStatus().getValue());

createdMembershipsList.add(setMembershipResult);

PNMembership pnMembership01 = getMembershipByChannelId(setMembershipResult, membership01ChannelId);
Expand Down Expand Up @@ -194,8 +199,12 @@ public void getMembershipsHappyPath() throws PubNubException {
.includeChannelType(true)
.includeChannelStatus(true)
.build())
.sort(Arrays.asList(PNSortKey.asc(PNSortKey.Key.TYPE)))
.sync();

assertEquals(membership01Type, getMembershipsResult.getData().get(0).getType().getValue());
assertEquals(membership02Type, getMembershipsResult.getData().get(1).getType().getValue());

PNMembership pnMembership01 = getMembershipByChannelId(getMembershipsResult, membership01ChannelId);
assertEquals(membership01Status, pnMembership01.getStatus().getValue());
assertEquals(membership01Type, pnMembership01.getType().getValue());
Expand Down Expand Up @@ -467,9 +476,9 @@ private List<PNChannelMembership> buildChannelMemberships(String membership01Ch
.status(membership02Status)
.type(membership02Type)
.build(),
PNChannelMembership.channel(membership03ChannelId), // this is deprecated usage
PNChannelMembership.channelWithCustom(membership04ChannelId, customChannelMembershipObject()), // this is deprecated usage
new PNChannelMembership.JustChannel(new PNChannelMembership.ChannelId(membership05ChannelId)), // this is deprecated usage
PNChannelMembership.channel(membership03ChannelId), // this old usage
PNChannelMembership.channelWithCustom(membership04ChannelId, customChannelMembershipObject()), // this old usage
new PNChannelMembership.JustChannel(new PNChannelMembership.ChannelId(membership05ChannelId)), // this old usage
new PNChannelMembership.ChannelWithCustom(new PNChannelMembership.ChannelId(membership06ChannelId), customChannelMembershipObject()) // this is deprecated usage
);
}
Expand Down
6 changes: 6 additions & 0 deletions ...va/com/pubnub/internal/java/endpoints/objects_api/channel/GetAllChannelsMetadataImpl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,12 @@ public static Collection<? extends com.pubnub.api.models.consumer.objects.PNSort
case UPDATED:
key = PNKey.UPDATED;
break;
case STATUS:
key = PNKey.STATUS;
break;
case TYPE:
key = PNKey.TYPE;
break;
default:
throw new IllegalStateException("Should never happen");
}
Expand Down
28 changes: 13 additions & 15 deletions ...in/java/com/pubnub/internal/java/endpoints/objects_api/members/SetChannelMembersImpl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,12 @@ static Collection<? extends com.pubnub.api.models.consumer.objects.PNSortKey<PNM
case UPDATED:
key = PNMemberKey.UUID_UPDATED;
break;
case STATUS:
key = PNMemberKey.STATUS;
break;
case TYPE:
key = PNMemberKey.TYPE;
break;
default:
throw new IllegalStateException("Should never happen");
}
Expand Down Expand Up @@ -177,31 +183,23 @@ static MemberInclude getMemberInclude(
return include;
} else {
// if deprecated setChannelMembership API use
MemberInclude.Builder builderWithCommonParams = MemberInclude.builder()
.includeTotalCount(includeTotalCount)
.includeCustom(includeCustom)
.includeUserType(includeType);
if (includeUser == Include.PNUUIDDetailsLevel.UUID) {
return MemberInclude.builder()
.includeTotalCount(includeTotalCount)
.includeCustom(includeCustom)
.includeUserType(includeType)
return builderWithCommonParams
.includeStatus(true)
.includeUser(true)
.build();


} else if (includeUser == Include.PNUUIDDetailsLevel.UUID_WITH_CUSTOM) {
return MemberInclude.builder()
.includeTotalCount(includeTotalCount)
.includeCustom(includeCustom)
.includeUserType(includeType)
return builderWithCommonParams
.includeStatus(true)
.includeUser(true)
.includeUserCustom(true)
.build();
} else {
return MemberInclude.builder()
.includeTotalCount(includeTotalCount)
.includeCustom(includeCustom)
.includeUserType(includeType)
.build();
return builderWithCommonParams.build();
}
}
}
Expand Down
26 changes: 13 additions & 13 deletions ...n/java/com/pubnub/internal/java/endpoints/objects_api/memberships/SetMembershipsImpl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,12 @@ static Collection<? extends com.pubnub.api.models.consumer.objects.PNSortKey<PNM
case UPDATED:
key = PNMembershipKey.CHANNEL_UPDATED;
break;
case STATUS:
key = PNMembershipKey.STATUS;
break;
case TYPE:
key = PNMembershipKey.TYPE;
break;
default:
throw new IllegalStateException("Should never happen");
}
Expand Down Expand Up @@ -146,27 +152,21 @@ static MembershipInclude getMembershipInclude(
return include;
} else {
// if deprecated setMembership API used
MembershipInclude.Builder builderWithCommonParams = MembershipInclude.builder()
.includeTotalCount(includeTotalCount)
.includeCustom(includeCustom)
.includeChannelType(includeType);
if (includeChannel == Include.PNChannelDetailsLevel.CHANNEL) {
return MembershipInclude.builder()
.includeTotalCount(includeTotalCount)
.includeCustom(includeCustom)
.includeChannelType(includeType)
return builderWithCommonParams
.includeChannel(true)
.build();
} else if (includeChannel == Include.PNChannelDetailsLevel.CHANNEL_WITH_CUSTOM) {
return MembershipInclude.builder()
.includeTotalCount(includeTotalCount)
.includeCustom(includeCustom)
.includeChannelType(includeType)
return builderWithCommonParams
.includeChannel(true)
.includeChannelCustom(true)
.build();
} else {
return MembershipInclude.builder()
.includeTotalCount(includeTotalCount)
.includeCustom(includeCustom)
.includeChannelType(includeType)
.build();
return builderWithCommonParams.build();
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion pubnub-kotlin/pubnub-kotlin-api/pubnub_kotlin_api.podspec
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |spec|
spec.name = 'pubnub_kotlin_api'
spec.version = '10.2.0'
spec.version = '10.2.1'
spec.homepage = ''
spec.source = { :http=> ''}
spec.authors = ''
Expand Down
8 changes: 8 additions & 0 deletions ...bnub-kotlin-api/src/commonMain/kotlin/com/pubnub/api/models/consumer/objects/PNSortKey.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,22 @@ enum class PNMembershipKey(override val fieldName: String) : SortField {
CHANNEL_ID("channel.id"),
CHANNEL_NAME("channel.name"),
CHANNEL_UPDATED("channel.updated"),
CHANNEL_STATUS("channel.status"),
CHANNEL_TYPE("channel.type"),
UPDATED("updated"),
STATUS("status"),
TYPE("type"),
}

enum class PNMemberKey(override val fieldName: String) : SortField {
UUID_ID("uuid.id"),
UUID_NAME("uuid.name"),
UUID_UPDATED("uuid.updated"),
UUID_STATUS("uuid.status"),
UUID_TYPE("uuid.type"),
UPDATED("updated"),
STATUS("status"),
TYPE("type"),
}

sealed class PNSortKey<T : SortField>(
Expand Down
2 changes: 1 addition & 1 deletion pubnub-kotlin/pubnub-kotlin-core-api/pubnub_kotlin_core_api.podspec
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |spec|
spec.name = 'pubnub_kotlin_core_api'
spec.version = '10.2.0'
spec.version = '10.2.1'
spec.homepage = ''
spec.source = { :http=> ''}
spec.authors = ''
Expand Down
Loading

0 comments on commit 9fcf653

Please sign in to comment.