feat: include snap names in ratings service requests

packages/app_center/lib/ratings/ratings_model.dart

@@ -31,7 +31,7 @@ class RatingsModel extends _$RatingsModel {
     }
 
     final results = await Future.wait([
-      _ratings.getRating(snapId),
+      _ratings.getRating(snapName, snapId),
       _ratings.getSnapVotes(snapId),
     ]);
 

packages/app_center/lib/ratings/ratings_service.dart

@@ -30,9 +30,13 @@ class RatingsService {
     }
   }
 
-  Future<ratings.Rating?> getRating(String snapId) async {
+  Future<ratings.Rating?> getRating(
+    String snapName,
+    // TODO: remove snapId once the server doesn't require it anymore
+    String snapId,
+  ) async {
     await _ensureValidToken();
-    return client.getRating(snapId, _jwt!);
+    return client.getRating(snapName, snapId, _jwt!);
   }
 
   Future<List<ratings.ChartData>> getChart(SnapCategoryEnum category) async {
@@ -46,7 +50,13 @@ class RatingsService {
 
   Future<void> vote(ratings.Vote vote) async {
     await _ensureValidToken();
-    await client.vote(vote.snapId, vote.snapRevision, vote.voteUp, _jwt!);
+    await client.vote(
+      vote.snapName,
+      vote.snapId,
+      vote.snapRevision,
+      vote.voteUp,
+      _jwt!,
+    );
   }
 
   Future<void> delete() async {

packages/app_center/test/ratings_service_test.dart

@@ -19,7 +19,7 @@ void main() {
     );
     final service = RatingsService(mockClient, id: 'myId');
 
-    final rating = await service.getRating('firefox');
+    final rating = await service.getRating('firefox', '1234');
     verify(mockClient.authenticate('myId')).called(1);
     expect(
       rating,
@@ -101,7 +101,7 @@ void main() {
       ),
     );
     verify(mockClient.authenticate('myId')).called(1);
-    verify(mockClient.vote('7890', 42, true, 'jwt')).called(1);
+    verify(mockClient.vote('thunderbird', '7890', 42, true, 'jwt')).called(1);
   });
 
   test('delete', () async {

packages/app_center/test/test_utils.dart

@@ -297,7 +297,7 @@ MockRatingsService registerMockRatingsService({
   List<Vote>? snapVotes,
 }) {
   final service = MockRatingsService();
-  when(service.getRating(any)).thenAnswer(
+  when(service.getRating(any, any)).thenAnswer(
     (_) async =>
         rating ??
         const Rating(
@@ -322,7 +322,7 @@ MockRatingsClient createMockRatingsClient({
 }) {
   final client = MockRatingsClient();
   when(client.authenticate(any)).thenAnswer((_) async => token ?? '');
-  when(client.getRating(any, any)).thenAnswer(
+  when(client.getRating(any, any, any)).thenAnswer(
     (_) async =>
         rating ??
         const Rating(

packages/app_center_ratings_client/lib/src/generated/ratings_features_app.pb.dart

@@ -18,11 +18,15 @@ import 'ratings_features_common.pb.dart' as $4;
 class GetRatingRequest extends $pb.GeneratedMessage {
   factory GetRatingRequest({
     $core.String? snapId,
+    $core.String? snapName,
   }) {
     final $result = create();
     if (snapId != null) {
       $result.snapId = snapId;
     }
+    if (snapName != null) {
+      $result.snapName = snapName;
+    }
     return $result;
   }
   GetRatingRequest._() : super();
@@ -31,6 +35,7 @@ class GetRatingRequest extends $pb.GeneratedMessage {
 
   static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'GetRatingRequest', package: const $pb.PackageName(_omitMessageNames ? '' : 'ratings.features.app'), createEmptyInstance: create)
     ..aOS(1, _omitFieldNames ? '' : 'snapId')
+    ..aOS(2, _omitFieldNames ? '' : 'snapName')
     ..hasRequiredFields = false
   ;
 
@@ -63,6 +68,15 @@ class GetRatingRequest extends $pb.GeneratedMessage {
   $core.bool hasSnapId() => $_has(0);
   @$pb.TagNumber(1)
   void clearSnapId() => clearField(1);
+
+  @$pb.TagNumber(2)
+  $core.String get snapName => $_getSZ(1);
+  @$pb.TagNumber(2)
+  set snapName($core.String v) { $_setString(1, v); }
+  @$pb.TagNumber(2)
+  $core.bool hasSnapName() => $_has(1);
+  @$pb.TagNumber(2)
+  void clearSnapName() => clearField(2);
 }
 
 class GetRatingResponse extends $pb.GeneratedMessage {

packages/app_center_ratings_client/lib/src/generated/ratings_features_app.pbjson.dart

@@ -18,12 +18,14 @@ const GetRatingRequest$json = {
   '1': 'GetRatingRequest',
   '2': [
     {'1': 'snap_id', '3': 1, '4': 1, '5': 9, '10': 'snapId'},
+    {'1': 'snap_name', '3': 2, '4': 1, '5': 9, '10': 'snapName'},
   ],
 };
 
 /// Descriptor for `GetRatingRequest`. Decode as a `google.protobuf.DescriptorProto`.
 final $typed_data.Uint8List getRatingRequestDescriptor = $convert.base64Decode(
-    'ChBHZXRSYXRpbmdSZXF1ZXN0EhcKB3NuYXBfaWQYASABKAlSBnNuYXBJZA==');
+    'ChBHZXRSYXRpbmdSZXF1ZXN0EhcKB3NuYXBfaWQYASABKAlSBnNuYXBJZBIbCglzbmFwX25hbW'
+    'UYAiABKAlSCHNuYXBOYW1l');
 
 @$core.Deprecated('Use getRatingResponseDescriptor instead')
 const GetRatingResponse$json = {

packages/app_center_ratings_client/lib/src/generated/ratings_features_user.pb.dart

@@ -115,56 +115,6 @@ class AuthenticateResponse extends $pb.GeneratedMessage {
   void clearToken() => clearField(1);
 }
 
-class ListMyVotesRequest extends $pb.GeneratedMessage {
-  factory ListMyVotesRequest({
-    $core.String? snapIdFilter,
-  }) {
-    final $result = create();
-    if (snapIdFilter != null) {
-      $result.snapIdFilter = snapIdFilter;
-    }
-    return $result;
-  }
-  ListMyVotesRequest._() : super();
-  factory ListMyVotesRequest.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
-  factory ListMyVotesRequest.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
-
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'ListMyVotesRequest', package: const $pb.PackageName(_omitMessageNames ? '' : 'ratings.features.user'), createEmptyInstance: create)
-    ..aOS(1, _omitFieldNames ? '' : 'snapIdFilter')
-    ..hasRequiredFields = false
-  ;
-
-  @$core.Deprecated(
-  'Using this can add significant overhead to your binary. '
-  'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
-  'Will be removed in next major version')
-  ListMyVotesRequest clone() => ListMyVotesRequest()..mergeFromMessage(this);
-  @$core.Deprecated(
-  'Using this can add significant overhead to your binary. '
-  'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
-  'Will be removed in next major version')
-  ListMyVotesRequest copyWith(void Function(ListMyVotesRequest) updates) => super.copyWith((message) => updates(message as ListMyVotesRequest)) as ListMyVotesRequest;
-
-  $pb.BuilderInfo get info_ => _i;
-
-  @$core.pragma('dart2js:noInline')
-  static ListMyVotesRequest create() => ListMyVotesRequest._();
-  ListMyVotesRequest createEmptyInstance() => create();
-  static $pb.PbList<ListMyVotesRequest> createRepeated() => $pb.PbList<ListMyVotesRequest>();
-  @$core.pragma('dart2js:noInline')
-  static ListMyVotesRequest getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<ListMyVotesRequest>(create);
-  static ListMyVotesRequest? _defaultInstance;
-
-  @$pb.TagNumber(1)
-  $core.String get snapIdFilter => $_getSZ(0);
-  @$pb.TagNumber(1)
-  set snapIdFilter($core.String v) { $_setString(0, v); }
-  @$pb.TagNumber(1)
-  $core.bool hasSnapIdFilter() => $_has(0);
-  @$pb.TagNumber(1)
-  void clearSnapIdFilter() => clearField(1);
-}
-
 class ListMyVotesResponse extends $pb.GeneratedMessage {
   factory ListMyVotesResponse({
     $core.Iterable<Vote>? votes,
@@ -212,11 +162,15 @@ class ListMyVotesResponse extends $pb.GeneratedMessage {
 class GetSnapVotesRequest extends $pb.GeneratedMessage {
   factory GetSnapVotesRequest({
     $core.String? snapId,
+    $core.String? snapName,
   }) {
     final $result = create();
     if (snapId != null) {
       $result.snapId = snapId;
     }
+    if (snapName != null) {
+      $result.snapName = snapName;
+    }
     return $result;
   }
   GetSnapVotesRequest._() : super();
@@ -225,6 +179,7 @@ class GetSnapVotesRequest extends $pb.GeneratedMessage {
 
   static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'GetSnapVotesRequest', package: const $pb.PackageName(_omitMessageNames ? '' : 'ratings.features.user'), createEmptyInstance: create)
     ..aOS(1, _omitFieldNames ? '' : 'snapId')
+    ..aOS(2, _omitFieldNames ? '' : 'snapName')
     ..hasRequiredFields = false
   ;
 
@@ -257,6 +212,15 @@ class GetSnapVotesRequest extends $pb.GeneratedMessage {
   $core.bool hasSnapId() => $_has(0);
   @$pb.TagNumber(1)
   void clearSnapId() => clearField(1);
+
+  @$pb.TagNumber(2)
+  $core.String get snapName => $_getSZ(1);
+  @$pb.TagNumber(2)
+  set snapName($core.String v) { $_setString(1, v); }
+  @$pb.TagNumber(2)
+  $core.bool hasSnapName() => $_has(1);
+  @$pb.TagNumber(2)
+  void clearSnapName() => clearField(2);
 }
 
 class GetSnapVotesResponse extends $pb.GeneratedMessage {
@@ -416,6 +380,7 @@ class VoteRequest extends $pb.GeneratedMessage {
     $core.String? snapId,
     $core.int? snapRevision,
     $core.bool? voteUp,
+    $core.String? snapName,
   }) {
     final $result = create();
     if (snapId != null) {
@@ -427,6 +392,9 @@ class VoteRequest extends $pb.GeneratedMessage {
     if (voteUp != null) {
       $result.voteUp = voteUp;
     }
+    if (snapName != null) {
+      $result.snapName = snapName;
+    }
     return $result;
   }
   VoteRequest._() : super();
@@ -437,6 +405,7 @@ class VoteRequest extends $pb.GeneratedMessage {
     ..aOS(1, _omitFieldNames ? '' : 'snapId')
     ..a<$core.int>(2, _omitFieldNames ? '' : 'snapRevision', $pb.PbFieldType.O3)
     ..aOB(3, _omitFieldNames ? '' : 'voteUp')
+    ..aOS(4, _omitFieldNames ? '' : 'snapName')
     ..hasRequiredFields = false
   ;
 
@@ -487,6 +456,15 @@ class VoteRequest extends $pb.GeneratedMessage {
   $core.bool hasVoteUp() => $_has(2);
   @$pb.TagNumber(3)
   void clearVoteUp() => clearField(3);
+
+  @$pb.TagNumber(4)
+  $core.String get snapName => $_getSZ(3);
+  @$pb.TagNumber(4)
+  set snapName($core.String v) { $_setString(3, v); }
+  @$pb.TagNumber(4)
+  $core.bool hasSnapName() => $_has(3);
+  @$pb.TagNumber(4)
+  void clearSnapName() => clearField(4);
 }
 
 

packages/app_center_ratings_client/lib/src/generated/ratings_features_user.pbjson.dart

@@ -37,19 +37,6 @@ const AuthenticateResponse$json = {
 final $typed_data.Uint8List authenticateResponseDescriptor = $convert.base64Decode(
     'ChRBdXRoZW50aWNhdGVSZXNwb25zZRIUCgV0b2tlbhgBIAEoCVIFdG9rZW4=');
 
-@$core.Deprecated('Use listMyVotesRequestDescriptor instead')
-const ListMyVotesRequest$json = {
-  '1': 'ListMyVotesRequest',
-  '2': [
-    {'1': 'snap_id_filter', '3': 1, '4': 1, '5': 9, '10': 'snapIdFilter'},
-  ],
-};
-
-/// Descriptor for `ListMyVotesRequest`. Decode as a `google.protobuf.DescriptorProto`.
-final $typed_data.Uint8List listMyVotesRequestDescriptor = $convert.base64Decode(
-    'ChJMaXN0TXlWb3Rlc1JlcXVlc3QSJAoOc25hcF9pZF9maWx0ZXIYASABKAlSDHNuYXBJZEZpbH'
-    'Rlcg==');
-
 @$core.Deprecated('Use listMyVotesResponseDescriptor instead')
 const ListMyVotesResponse$json = {
   '1': 'ListMyVotesResponse',
@@ -68,12 +55,14 @@ const GetSnapVotesRequest$json = {
   '1': 'GetSnapVotesRequest',
   '2': [
     {'1': 'snap_id', '3': 1, '4': 1, '5': 9, '10': 'snapId'},
+    {'1': 'snap_name', '3': 2, '4': 1, '5': 9, '10': 'snapName'},
   ],
 };
 
 /// Descriptor for `GetSnapVotesRequest`. Decode as a `google.protobuf.DescriptorProto`.
 final $typed_data.Uint8List getSnapVotesRequestDescriptor = $convert.base64Decode(
-    'ChNHZXRTbmFwVm90ZXNSZXF1ZXN0EhcKB3NuYXBfaWQYASABKAlSBnNuYXBJZA==');
+    'ChNHZXRTbmFwVm90ZXNSZXF1ZXN0EhcKB3NuYXBfaWQYASABKAlSBnNuYXBJZBIbCglzbmFwX2'
+    '5hbWUYAiABKAlSCHNuYXBOYW1l');
 
 @$core.Deprecated('Use getSnapVotesResponseDescriptor instead')
 const GetSnapVotesResponse$json = {
@@ -114,11 +103,13 @@ const VoteRequest$json = {
     {'1': 'snap_id', '3': 1, '4': 1, '5': 9, '10': 'snapId'},
     {'1': 'snap_revision', '3': 2, '4': 1, '5': 5, '10': 'snapRevision'},
     {'1': 'vote_up', '3': 3, '4': 1, '5': 8, '10': 'voteUp'},
+    {'1': 'snap_name', '3': 4, '4': 1, '5': 9, '10': 'snapName'},
   ],
 };
 
 /// Descriptor for `VoteRequest`. Decode as a `google.protobuf.DescriptorProto`.
 final $typed_data.Uint8List voteRequestDescriptor = $convert.base64Decode(
     'CgtWb3RlUmVxdWVzdBIXCgdzbmFwX2lkGAEgASgJUgZzbmFwSWQSIwoNc25hcF9yZXZpc2lvbh'
-    'gCIAEoBVIMc25hcFJldmlzaW9uEhcKB3ZvdGVfdXAYAyABKAhSBnZvdGVVcA==');
+    'gCIAEoBVIMc25hcFJldmlzaW9uEhcKB3ZvdGVfdXAYAyABKAhSBnZvdGVVcBIbCglzbmFwX25h'
+    'bWUYBCABKAlSCHNuYXBOYW1l');
 

packages/app_center_ratings_client/lib/src/ratings_client.dart

@@ -70,10 +70,15 @@ class RatingsClient {
   }
 
   Future<Rating> getRating(
+    String snapName,
+    // TODO: remove snapId once the server doesn't require it anymore
     String snapId,
     String token,
   ) async {
-    final request = app_pb.GetRatingRequest(snapId: snapId);
+    final request = app_pb.GetRatingRequest(
+      snapName: snapName,
+      snapId: snapId,
+    );
     final callOptions =
         CallOptions(metadata: {'authorization': 'Bearer $token'});
     final grpcResponse = await _appClient.getRating(
@@ -95,12 +100,15 @@ class RatingsClient {
   }
 
   Future<void> vote(
+    String snapName,
+    // TODO: remove snapId once the server doesn't require it anymore
     String snapId,
     int snapRevision,
     bool voteUp,
     String token,
   ) async {
     final request = user_pb.VoteRequest(
+      snapName: snapName,
       snapId: snapId,
       snapRevision: snapRevision,
       voteUp: voteUp,

packages/app_center_ratings_client/protos/ratings_features_app.proto

@@ -10,6 +10,7 @@ service App {
 
 message GetRatingRequest {
   string snap_id = 1;
+  string snap_name = 2;
 }
 
 message GetRatingResponse {

packages/app_center_ratings_client/protos/ratings_features_user.proto

@@ -21,16 +21,13 @@ message AuthenticateResponse {
   string token = 1;
 }
 
-message ListMyVotesRequest {
-  string snap_id_filter = 1;
-}
-
 message ListMyVotesResponse {
   repeated Vote votes = 1;
 }
 
 message GetSnapVotesRequest {
   string snap_id = 1;
+  string snap_name = 2;
 }
 
 message GetSnapVotesResponse {
@@ -49,4 +46,5 @@ message VoteRequest {
   string snap_id = 1;
   int32 snap_revision = 2;
   bool vote_up = 3;
+  string snap_name = 4;
 }