MirrorMirror
/
Signal-Server
mirror of https://github.com/signalapp/Signal-Server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Default to 0 `usedBytes` in `GET /v1/archives`

This commit is contained in:
Ravi Khadiwala 2024-04-30 17:56:40 -05:00 committed by ravi-signal
parent d7f14339fe
commit 37aa3b8e49
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
service/src/main/java/org/whispersystems/textsecuregcm/controllers/ArchiveController.java
View File

@ -311,9 +311,8 @@ public class ArchiveController {
@Schema(description = "The name of the most recent message backup on the cdn. The backup is at /backupDir/backupName") @Schema(description = "The name of the most recent message backup on the cdn. The backup is at /backupDir/backupName")
String backupName, String backupName,
@Nullable
@Schema(description = "The amount of space used to store media") @Schema(description = "The amount of space used to store media")
Long usedSpace) {} long usedSpace) {}
@GET @GET
@Produces(MediaType.APPLICATION_JSON) @Produces(MediaType.APPLICATION_JSON)
@ -345,7 +344,7 @@ public class ArchiveController {
backupInfo.backupSubdir(), backupInfo.backupSubdir(),
backupInfo.mediaSubdir(), backupInfo.mediaSubdir(),
backupInfo.messageBackupKey(), backupInfo.messageBackupKey(),
backupInfo.mediaUsedSpace().orElse(null))); backupInfo.mediaUsedSpace().orElse(0L)));
} }
public record SetPublicKeyRequest( public record SetPublicKeyRequest(

2
service/src/test/java/org/whispersystems/textsecuregcm/controllers/ArchiveControllerTest.java
View File

@ -337,7 +337,7 @@ public class ArchiveControllerTest {
assertThat(response.backupDir()).isEqualTo("myBackupDir"); assertThat(response.backupDir()).isEqualTo("myBackupDir");
assertThat(response.backupName()).isEqualTo("filename"); assertThat(response.backupName()).isEqualTo("filename");
assertThat(response.cdn()).isEqualTo(1); assertThat(response.cdn()).isEqualTo(1);
assertThat(response.usedSpace()).isNull(); assertThat(response.usedSpace()).isEqualTo(0L);
} }
@Test @Test