eightequal/AstralRinth
1
0
Fork 0
forked from didirus/AstralRinth
Code Pull Requests Activity

test (#828)

Browse Source
This commit is contained in:
Wyatt Verchere
2024-01-06 22:47:42 -08:00
committed by GitHub
parent 59c269c8d0
commit 75e5bec962
3 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/database/models/legacy_loader_fields.rs
View File

@@ -209,8 +209,12 @@ impl<'a> MinecraftGameVersionBuilder<'a> {
INSERT INTO loader_field_enum_values (enum_id, value, created, metadata)
VALUES ($1, $2, COALESCE($3, timezone('utc', now())), $4)
ON CONFLICT (enum_id, value) DO UPDATE
SET metadata = COALESCE($4, loader_field_enum_values.metadata),
created = COALESCE($3, loader_field_enum_values.created)
SET metadata = jsonb_set(
COALESCE(loader_field_enum_values.metadata, $4),
'{type}',
COALESCE($4->'type', loader_field_enum_values.metadata->'type')
),
created = COALESCE($3, loader_field_enum_values.created)
RETURNING id
",
game_versions_enum.id.0,

4
src/models/v2/projects.rs
View File

@@ -5,7 +5,6 @@ use std::collections::HashMap;
use super::super::ids::OrganizationId;
use super::super::teams::TeamId;
use super::super::users::UserId;
use crate::database::models::legacy_loader_fields::MinecraftGameVersion;
use crate::database::models::{version_item, DatabaseError};
use crate::database::redis::RedisPool;
use crate::models::ids::{ProjectId, VersionId};
@@ -80,7 +79,6 @@ impl LegacyProject {
pub fn from(data: Project, versions_item: Option<version_item::QueryVersion>) -> Self {
let mut client_side = LegacySideType::Unknown;
let mut server_side = LegacySideType::Unknown;
let mut game_versions = Vec::new();
// V2 versions only have one project type- v3 versions can rarely have multiple.
// We'll prioritize 'modpack' first, and if neither are found, use the first one.
@@ -104,7 +102,7 @@ impl LegacyProject {
let mut loaders = data.loaders;
game_versions = data
let game_versions = data
.fields
.get("game_versions")
.unwrap_or(&Vec::new())