Skip to content

Commit

Permalink
adjust types to be more sql friendly
Browse files Browse the repository at this point in the history
  • Loading branch information
RobDavenport committed Apr 16, 2024
1 parent 3edec27 commit 195a968
Show file tree
Hide file tree
Showing 14 changed files with 113 additions and 128 deletions.
6 changes: 3 additions & 3 deletions gamercade_app/src/local_directory/game.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ use rusqlite::Connection;
use super::{tag::TagId, LocalDirectory};

pub struct Game {
pub id: u64,
pub id: i64,
pub title: String,
pub short_description: String,
pub long_description: Option<String>,
Expand All @@ -14,8 +14,8 @@ pub struct Game {
}

pub struct GameRelease {
pub id: u64,
pub checksum: u128,
pub id: i64,
pub checksum: i64,
pub name: String,
}

Expand Down
16 changes: 8 additions & 8 deletions gamercade_interface/proto/author.proto
Original file line number Diff line number Diff line change
Expand Up @@ -10,30 +10,30 @@ service AuthorService {
}

message AdjustAuthorRequest {
fixed64 game_id = 1;
fixed64 user_id = 2;
sfixed64 game_id = 1;
sfixed64 user_id = 2;

optional string title = 3;
optional uint32 permission_level_id = 4;
optional sint32 permission_level_id = 4;
}

message AdjustAuthorResponse {
fixed64 game_id = 1;
sfixed64 game_id = 1;
repeated Author authors = 2;
}

message Author {
fixed64 user_id = 1;
sfixed64 user_id = 1;
string title = 2;
uint32 permission_level_id = 3;
int32 permission_level_id = 3;
}

message GlobalPermissionLevels {
repeated PermissionLevel levels = 1;
}

message PermissionLevel {
uint32 level_id = 1;
int32 level_id = 1;
string level_name = 2;
uint32 level_strength = 3;
int32 level_strength = 3;
}
4 changes: 2 additions & 2 deletions gamercade_interface/proto/chat.proto
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@ service ChatService {
message ChatChannel {
oneof channel {
common.Empty global = 1;
uint32 game_id = 2;
int32 game_id = 2;
common.UUID room_uuid = 3;
}
}

message ServerChatMessage {
uint32 user_id = 1;
int32 user_id = 1;
string message_text = 2;
}

Expand Down
25 changes: 10 additions & 15 deletions gamercade_interface/proto/game.proto
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
syntax = "proto3";

import "common.proto";
import "release.proto";

package game;

Expand All @@ -15,50 +16,44 @@ service GameService {
}

message UpdateGameRequest {
optional fixed64 game_id = 1;
optional sfixed64 game_id = 1;
optional string title = 2;
optional string short_description = 3;
optional string long_description = 4;
}

message GameInfoRequest {
fixed64 game_id = 1;
sfixed64 game_id = 1;
}

message MultipleGamesInfoRequest {
repeated fixed64 game_ids = 1;
repeated sfixed64 game_ids = 1;
}

message MultipleGamesInfoResponse {
repeated GameInfoBasic games_info = 1;
}

message GameInfoBasic {
fixed64 game_id = 1;
sfixed64 game_id = 1;
string title = 2;
string short_description = 3;
GameRelease latest_release = 4;
release.ReleaseResponse latest_release = 4;
float average_rating = 5;
repeated uint32 tags = 6;
repeated int32 tags = 6;
}

message GameInfoDetailed {
GameInfoBasic basic_info = 1;
string long_description = 2;
repeated GameRelease releases = 3;
repeated release.ReleaseResponse releases = 3;
repeated Author authors = 4;
}

message GameRelease {
fixed64 release_id = 1;
bytes checksum = 2;
string release_name = 3;
}

message Author {
fixed64 user_id = 1;
sfixed64 user_id = 1;
}

message DeleteGameRequest {
fixed64 game_id = 1;
sfixed64 game_id = 1;
}
12 changes: 6 additions & 6 deletions gamercade_interface/proto/release.proto
Original file line number Diff line number Diff line change
Expand Up @@ -11,25 +11,25 @@ service ReleaseService {
}

message CreateReleaseRequest {
fixed64 game_id = 1;
sfixed64 game_id = 1;
string release_name = 2;
}

message CreateReleaseResponse {
fixed64 release_id = 1;
sfixed64 release_id = 1;
}

message UpdateReleaseRequest {
fixed64 release_id = 1;
sfixed64 release_id = 1;
optional string new_name = 2;
}

message ReleaseResponse {
fixed64 release_id = 1;
sfixed64 release_id = 1;
string release_name = 2;
fixed64 checksum = 3;
optional sfixed64 checksum = 3;
}

message DeleteReleaseRequest {
fixed64 release_id = 1;
sfixed64 release_id = 1;
}
12 changes: 6 additions & 6 deletions gamercade_interface/proto/review.proto
Original file line number Diff line number Diff line change
Expand Up @@ -11,22 +11,22 @@ service ReviewService {
}

message ReviewGameRequest {
fixed64 game_id = 1;
uint32 rating = 2;
sfixed64 game_id = 1;
int32 rating = 2;
string comments = 3;
}

message SingleGameRequest {
fixed64 game_id = 1;
sfixed64 game_id = 1;
}

message GameReviews {
repeated GameReviewEntry reviews = 1;
}

message GameReviewEntry {
fixed64 user_id = 1;
uint32 rating = 2;
sfixed64 user_id = 1;
int32 rating = 2;
string comments = 3;
uint64 review_date_s = 4;
int64 review_date_s = 4;
}
6 changes: 3 additions & 3 deletions gamercade_interface/proto/tag.proto
Original file line number Diff line number Diff line change
Expand Up @@ -10,17 +10,17 @@ service TagService {
}

message AdjustGameTagRequest {
uint32 tag_id = 1;
int32 tag_id = 1;
bool set_to = 2;
}

message AdjustGameTagResponse {
fixed64 game_id = 1;
sfixed64 game_id = 1;
repeated Tag tags = 2;
}

message Tag {
uint32 pid = 1;
int32 pid = 1;
string name = 2;
}

Expand Down
6 changes: 3 additions & 3 deletions gamercade_interface/proto/user.proto
Original file line number Diff line number Diff line change
Expand Up @@ -12,16 +12,16 @@ service UsersService {
}

message UserRequest {
fixed64 user_id = 1;
sfixed64 user_id = 1;
}

message UserInfo {
fixed64 user_id = 1;
sfixed64 user_id = 1;
string username = 2;
}

message UsersRequest {
repeated fixed64 user_ids = 1;
repeated sfixed64 user_ids = 1;
}

message UsersResponse {
Expand Down
32 changes: 16 additions & 16 deletions gamercade_interface/src/output/author.rs
Original file line number Diff line number Diff line change
@@ -1,32 +1,32 @@
#[allow(clippy::derive_partial_eq_without_eq)]
#[derive(Clone, PartialEq, ::prost::Message)]
pub struct AdjustAuthorRequest {
#[prost(fixed64, tag = "1")]
pub game_id: u64,
#[prost(fixed64, tag = "2")]
pub user_id: u64,
#[prost(sfixed64, tag = "1")]
pub game_id: i64,
#[prost(sfixed64, tag = "2")]
pub user_id: i64,
#[prost(string, optional, tag = "3")]
pub title: ::core::option::Option<::prost::alloc::string::String>,
#[prost(uint32, optional, tag = "4")]
pub permission_level_id: ::core::option::Option<u32>,
#[prost(sint32, optional, tag = "4")]
pub permission_level_id: ::core::option::Option<i32>,
}
#[allow(clippy::derive_partial_eq_without_eq)]
#[derive(Clone, PartialEq, ::prost::Message)]
pub struct AdjustAuthorResponse {
#[prost(fixed64, tag = "1")]
pub game_id: u64,
#[prost(sfixed64, tag = "1")]
pub game_id: i64,
#[prost(message, repeated, tag = "2")]
pub authors: ::prost::alloc::vec::Vec<Author>,
}
#[allow(clippy::derive_partial_eq_without_eq)]
#[derive(Clone, PartialEq, ::prost::Message)]
pub struct Author {
#[prost(fixed64, tag = "1")]
pub user_id: u64,
#[prost(sfixed64, tag = "1")]
pub user_id: i64,
#[prost(string, tag = "2")]
pub title: ::prost::alloc::string::String,
#[prost(uint32, tag = "3")]
pub permission_level_id: u32,
#[prost(int32, tag = "3")]
pub permission_level_id: i32,
}
#[allow(clippy::derive_partial_eq_without_eq)]
#[derive(Clone, PartialEq, ::prost::Message)]
Expand All @@ -37,12 +37,12 @@ pub struct GlobalPermissionLevels {
#[allow(clippy::derive_partial_eq_without_eq)]
#[derive(Clone, PartialEq, ::prost::Message)]
pub struct PermissionLevel {
#[prost(uint32, tag = "1")]
pub level_id: u32,
#[prost(int32, tag = "1")]
pub level_id: i32,
#[prost(string, tag = "2")]
pub level_name: ::prost::alloc::string::String,
#[prost(uint32, tag = "3")]
pub level_strength: u32,
#[prost(int32, tag = "3")]
pub level_strength: i32,
}
/// Generated client implementations.
pub mod author_service_client {
Expand Down
8 changes: 4 additions & 4 deletions gamercade_interface/src/output/chat.rs
Original file line number Diff line number Diff line change
Expand Up @@ -11,17 +11,17 @@ pub mod chat_channel {
pub enum Channel {
#[prost(message, tag = "1")]
Global(super::super::common::Empty),
#[prost(uint32, tag = "2")]
GameId(u32),
#[prost(int32, tag = "2")]
GameId(i32),
#[prost(message, tag = "3")]
RoomUuid(super::super::common::Uuid),
}
}
#[allow(clippy::derive_partial_eq_without_eq)]
#[derive(Clone, PartialEq, ::prost::Message)]
pub struct ServerChatMessage {
#[prost(uint32, tag = "1")]
pub user_id: u32,
#[prost(int32, tag = "1")]
pub user_id: i32,
#[prost(string, tag = "2")]
pub message_text: ::prost::alloc::string::String,
}
Expand Down
Loading

0 comments on commit 195a968

Please sign in to comment.