dan/Portfolio
1
0
Fork 0
mirror of https://github.com/danbulant/Portfolio synced 2026-06-24 17:11:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

refactor: change ip address inet type to string

Browse source
This commit is contained in:
Sebastian Pravda 2022-10-29 12:24:45 +02:00
parent 5e36b7b3c8
commit 98110dcf96
No known key found for this signature in database
GPG key ID: F3BC84F08EFA3F57
3 changed files with 2 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
core/src/services/candidate_service.rs
View file

@ -2,7 +2,7 @@ use chrono::Duration;
use entity::candidate; use entity::candidate;
use sea_orm::{DatabaseConnection, prelude::Uuid, ModelTrait}; use sea_orm::{DatabaseConnection, prelude::Uuid, ModelTrait};
use crate::{crypto::{self, hash_sha256}, Query, token::{generate_candidate_token, candidate_token::CandidateToken}, error::{ServiceError, USER_NOT_FOUND_ERROR, INVALID_CREDENTIALS_ERROR, DB_ERROR, USER_NOT_FOUND_BY_JWT_ID, USER_NOT_FOUND_BY_SESSION_ID}, Mutation}; use crate::{crypto::{self}, Query, token::{generate_candidate_token, candidate_token::CandidateToken}, error::{ServiceError, USER_NOT_FOUND_ERROR, INVALID_CREDENTIALS_ERROR, DB_ERROR, USER_NOT_FOUND_BY_JWT_ID, USER_NOT_FOUND_BY_SESSION_ID}, Mutation};
pub struct CandidateService; pub struct CandidateService;

1
entity/src/session.rs
View file

@ -8,7 +8,6 @@ pub struct Model {
#[sea_orm(primary_key, auto_increment = false)] #[sea_orm(primary_key, auto_increment = false)]
pub id: Uuid, pub id: Uuid,
pub user_id: i32, pub user_id: i32,
#[sea_orm(column_type = "Custom(\"inet\".to_owned())")]
pub ip_address: String, pub ip_address: String,
pub created_at: DateTime, pub created_at: DateTime,
pub expires_at: DateTime, pub expires_at: DateTime,

19
migration/src/m20221025_154422_create_session.rs
View file

@ -1,28 +1,11 @@
use sea_orm_migration::prelude::*; use sea_orm_migration::prelude::*;
use crate::m20221024_121621_create_candidate::Candidate;
#[derive(DeriveMigrationName)] #[derive(DeriveMigrationName)]
pub struct Migration; pub struct Migration;
#[async_trait::async_trait] #[async_trait::async_trait]
impl MigrationTrait for Migration { impl MigrationTrait for Migration {
async fn up(&self, manager: &SchemaManager) -> Result<(), DbErr> { async fn up(&self, manager: &SchemaManager) -> Result<(), DbErr> {
let table = Table::create()
.table(Session::Table)
.if_not_exists()
.col(
ColumnDef::new(Session::Id)
.uuid()
.not_null()
.unique_key()
.primary_key(),
)
.col(ColumnDef::new(Session::UserId).integer().not_null())
.col(ColumnDef::new(Session::CreatedAt).date_time().not_null())
.col(ColumnDef::new(Session::ExpiresAt).date_time().not_null())
.to_owned();
manager manager
.create_table( .create_table(
Table::create() Table::create()
@ -36,7 +19,7 @@ impl MigrationTrait for Migration {
.primary_key(), .primary_key(),
) )
.col(ColumnDef::new(Session::UserId).integer().not_null()) .col(ColumnDef::new(Session::UserId).integer().not_null())
.col(ColumnDef::new(Session::IpAddress).inet().not_null()) .col(ColumnDef::new(Session::IpAddress).string().not_null())
.col(ColumnDef::new(Session::CreatedAt).date_time().not_null()) .col(ColumnDef::new(Session::CreatedAt).date_time().not_null())
.col(ColumnDef::new(Session::ExpiresAt).date_time().not_null()) .col(ColumnDef::new(Session::ExpiresAt).date_time().not_null())
.to_owned(), .to_owned(),