Page MenuHomePhabricator
Differential D6091

[keyserver] move logic to fetch not acknowledged policies to separate function
ClosedPublic
Actions

Authored by kamil on Dec 29 2022, 4:24 AM.
Tags
None
Referenced Files
Unknown Object (File)
Mon, Mar 17, 10:41 AM
Unknown Object (File)
Mon, Mar 17, 10:41 AM
Unknown Object (File)
Mon, Mar 17, 10:41 AM
Unknown Object (File)
Mon, Mar 17, 10:40 AM
Unknown Object (File)
Mon, Mar 17, 10:29 AM
Unknown Object (File)
Thu, Mar 6, 4:55 AM
Unknown Object (File)
Thu, Mar 6, 2:46 AM
Unknown Object (File)
Feb 24 2025, 12:51 PM
View All Files
Subscribers
ashoat
atul
tomek

Details

Reviewers
inka
michal
• przemek
Commits
rCOMMa027ed5d94af: [keyserver] move logic to fetch not acknowledged policies to separate function
Summary

This is just a refactor, in next diffs I'll introduce changes that will require checking for not acknowledged policies and this will make possible to avoid try {} catch () {} pattern by using simple function call and improve readability.

Test Plan

Maintain previous functionality of this function

Diff Detail

Repository
rCOMM Comm
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Revision Contents
Changeset List

PathSize
keyserver/
src/
fetchers/
18 lines
utils/
10 lines

Diff 21132

View Options

keyserver/src/fetchers/policy-acknowledgment-fetchers.js

Show All 35 Linespub enum ReportType {
#[default] #[default]
ErrorReport = 0, ErrorReport = 0,
ThreadInconsistency = 1, ThreadInconsistency = 1,
EntryInconsistency = 2, EntryInconsistency = 2,
MediaMission = 3, MediaMission = 3,
UserInconsistency = 4, UserInconsistency = 4,
} }
impl ReportType {
pub fn is_error(&self) -> bool {
matches!(self, Self::ErrorReport)
}
pub fn is_media_mission(&self) -> bool {
matches!(self, Self::MediaMission)
}
pub fn is_inconsistency(&self) -> bool {
matches!(
self,
ReportType::ThreadInconsistency
| ReportType::EntryInconsistency
| ReportType::UserInconsistency
)
}
}
/// Report platform /// Report platform
#[derive(Clone, Debug, Serialize, Deserialize, Display)] #[derive(Clone, Debug, Serialize, Deserialize, Display)]
#[serde(rename_all = "lowercase")] #[serde(rename_all = "lowercase")]
pub enum ReportPlatform { pub enum ReportPlatform {
Android, Android,
IOS, IOS,
Web, Web,
Windows, Windows,
MacOS, MacOS,
} }
#[derive(Debug, Serialize, Deserialize)] #[derive(Debug, Serialize, Deserialize)]
#[serde(rename_all = "camelCase")] #[serde(rename_all = "camelCase")]
pub struct PlatformDetails { pub struct PlatformDetails {
pub platform: ReportPlatform, pub platform: ReportPlatform,
code_version: Option<u16>, pub code_version: Option<u16>,
state_version: Option<u16>, pub state_version: Option<u16>,
} }
/// Input report payload - this is the JSON we receive from clients /// Input report payload - this is the JSON we receive from clients
#[derive(Debug, Deserialize)] #[derive(Debug, Deserialize)]
#[serde(rename_all = "camelCase")] #[serde(rename_all = "camelCase")]
#[serde(remote = "Self")] // we delegate to our custom validation trait #[serde(remote = "Self")] // we delegate to our custom validation trait
pub struct ReportInput { pub struct ReportInput {
pub platform_details: PlatformDetails, pub platform_details: PlatformDetails,
▲ Show 20 Lines • Show All 49 Lines • Show Last 20 Lines
View Options

keyserver/src/utils/validation-utils.js

Show All 35 Linespub enum ReportType {
#[default] #[default]
ErrorReport = 0, ErrorReport = 0,
ThreadInconsistency = 1, ThreadInconsistency = 1,
EntryInconsistency = 2, EntryInconsistency = 2,
MediaMission = 3, MediaMission = 3,
UserInconsistency = 4, UserInconsistency = 4,
} }
impl ReportType {
pub fn is_error(&self) -> bool {
matches!(self, Self::ErrorReport)
}
pub fn is_media_mission(&self) -> bool {
matches!(self, Self::MediaMission)
}
pub fn is_inconsistency(&self) -> bool {
matches!(
self,
ReportType::ThreadInconsistency
| ReportType::EntryInconsistency
| ReportType::UserInconsistency
)
}
}
/// Report platform /// Report platform
#[derive(Clone, Debug, Serialize, Deserialize, Display)] #[derive(Clone, Debug, Serialize, Deserialize, Display)]
#[serde(rename_all = "lowercase")] #[serde(rename_all = "lowercase")]
pub enum ReportPlatform { pub enum ReportPlatform {
Android, Android,
IOS, IOS,
Web, Web,
Windows, Windows,
MacOS, MacOS,
} }
#[derive(Debug, Serialize, Deserialize)] #[derive(Debug, Serialize, Deserialize)]
#[serde(rename_all = "camelCase")] #[serde(rename_all = "camelCase")]
pub struct PlatformDetails { pub struct PlatformDetails {
pub platform: ReportPlatform, pub platform: ReportPlatform,
code_version: Option<u16>, pub code_version: Option<u16>,
state_version: Option<u16>, pub state_version: Option<u16>,
} }
/// Input report payload - this is the JSON we receive from clients /// Input report payload - this is the JSON we receive from clients
#[derive(Debug, Deserialize)] #[derive(Debug, Deserialize)]
#[serde(rename_all = "camelCase")] #[serde(rename_all = "camelCase")]
#[serde(remote = "Self")] // we delegate to our custom validation trait #[serde(remote = "Self")] // we delegate to our custom validation trait
pub struct ReportInput { pub struct ReportInput {
pub platform_details: PlatformDetails, pub platform_details: PlatformDetails,
▲ Show 20 Lines • Show All 49 Lines • Show Last 20 Lines