mirror of
https://github.com/CyberL1/Minecraft-Realms-Emulator.git
synced 2024-11-25 07:28:23 -05:00
feat: subscription v2
This commit is contained in:
parent
5dd9a261fe
commit
e94d256fc9
@ -1,7 +1,7 @@
|
|||||||
using Microsoft.AspNetCore.Mvc;
|
using Microsoft.AspNetCore.Mvc;
|
||||||
using Microsoft.EntityFrameworkCore;
|
using Microsoft.EntityFrameworkCore;
|
||||||
using Minecraft_Realms_Emulator.Data;
|
using Minecraft_Realms_Emulator.Data;
|
||||||
using Minecraft_Realms_Emulator.Entities;
|
using Minecraft_Realms_Emulator.Responses;
|
||||||
|
|
||||||
namespace Minecraft_Realms_Emulator.Controllers
|
namespace Minecraft_Realms_Emulator.Controllers
|
||||||
{
|
{
|
||||||
@ -21,11 +21,18 @@ namespace Minecraft_Realms_Emulator.Controllers
|
|||||||
var world = await _context.Worlds.FindAsync(id);
|
var world = await _context.Worlds.FindAsync(id);
|
||||||
var subscriptions = await _context.Subscriptions.ToListAsync();
|
var subscriptions = await _context.Subscriptions.ToListAsync();
|
||||||
|
|
||||||
if (world == null) return NotFound("Subscription njot found");
|
if (world == null) return NotFound("Subscription not found");
|
||||||
|
|
||||||
var subscription = subscriptions.Find(s => s.RemoteId == world.RemoteSubscriptionId);
|
var subscription = subscriptions.Find(s => s.World.RemoteSubscriptionId == world.RemoteSubscriptionId);
|
||||||
|
|
||||||
return Ok(subscription);
|
var sub = new Subscription
|
||||||
|
{
|
||||||
|
StartDate = subscription.StartDate,
|
||||||
|
DaysLeft = subscription.World.DaysLeft,
|
||||||
|
SubscriptionType = subscription.SubscriptionType
|
||||||
|
};
|
||||||
|
|
||||||
|
return Ok(sub);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -91,9 +91,8 @@ namespace Minecraft_Realms_Emulator.Controllers
|
|||||||
|
|
||||||
var subscription = new Subscription
|
var subscription = new Subscription
|
||||||
{
|
{
|
||||||
RemoteId = world.RemoteSubscriptionId,
|
World = world,
|
||||||
StartDate = ((DateTimeOffset) DateTime.Now).ToUnixTimeMilliseconds().ToString(),
|
StartDate = ((DateTimeOffset) DateTime.Now).ToUnixTimeMilliseconds().ToString(),
|
||||||
DaysLeft = 30,
|
|
||||||
SubscriptionType = SubscriptionType.NORMAL.ToString()
|
SubscriptionType = SubscriptionType.NORMAL.ToString()
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -3,9 +3,8 @@
|
|||||||
public class Subscription
|
public class Subscription
|
||||||
{
|
{
|
||||||
public int Id { get; set; }
|
public int Id { get; set; }
|
||||||
public string RemoteId { get; set; } = Guid.NewGuid().ToString();
|
public World World { get; set; }
|
||||||
public string StartDate { get; set; } = ((DateTimeOffset) DateTime.Now).ToUnixTimeMilliseconds().ToString();
|
public string StartDate { get; set; } = ((DateTimeOffset) DateTime.Now).ToUnixTimeMilliseconds().ToString();
|
||||||
public int DaysLeft { get; set; } = 30;
|
|
||||||
public string SubscriptionType { get; set; } = "NORMAL";
|
public string SubscriptionType { get; set; } = "NORMAL";
|
||||||
}
|
}
|
||||||
}
|
}
|
168
Minecraft-Realms-Emulator/Migrations/20240213121346_Subscription_v2.Designer.cs
generated
Normal file
168
Minecraft-Realms-Emulator/Migrations/20240213121346_Subscription_v2.Designer.cs
generated
Normal file
@ -0,0 +1,168 @@
|
|||||||
|
// <auto-generated />
|
||||||
|
using System;
|
||||||
|
using System.Text.Json;
|
||||||
|
using Microsoft.EntityFrameworkCore;
|
||||||
|
using Microsoft.EntityFrameworkCore.Infrastructure;
|
||||||
|
using Microsoft.EntityFrameworkCore.Migrations;
|
||||||
|
using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
|
||||||
|
using Minecraft_Realms_Emulator.Data;
|
||||||
|
using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
|
||||||
|
|
||||||
|
#nullable disable
|
||||||
|
|
||||||
|
namespace Minecraft_Realms_Emulator.Migrations
|
||||||
|
{
|
||||||
|
[DbContext(typeof(DataContext))]
|
||||||
|
[Migration("20240213121346_Subscription_v2")]
|
||||||
|
partial class Subscription_v2
|
||||||
|
{
|
||||||
|
/// <inheritdoc />
|
||||||
|
protected override void BuildTargetModel(ModelBuilder modelBuilder)
|
||||||
|
{
|
||||||
|
#pragma warning disable 612, 618
|
||||||
|
modelBuilder
|
||||||
|
.HasAnnotation("ProductVersion", "8.0.1")
|
||||||
|
.HasAnnotation("Relational:MaxIdentifierLength", 63);
|
||||||
|
|
||||||
|
NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
|
||||||
|
|
||||||
|
modelBuilder.Entity("Minecraft_Realms_Emulator.Entities.Connection", b =>
|
||||||
|
{
|
||||||
|
b.Property<string>("Address")
|
||||||
|
.IsRequired()
|
||||||
|
.HasColumnType("text");
|
||||||
|
|
||||||
|
b.Property<bool>("PendingUpdate")
|
||||||
|
.HasColumnType("boolean");
|
||||||
|
|
||||||
|
b.Property<int>("WorldId")
|
||||||
|
.HasColumnType("integer");
|
||||||
|
|
||||||
|
b.HasIndex("WorldId");
|
||||||
|
|
||||||
|
b.ToTable("Connections");
|
||||||
|
});
|
||||||
|
|
||||||
|
modelBuilder.Entity("Minecraft_Realms_Emulator.Entities.Subscription", b =>
|
||||||
|
{
|
||||||
|
b.Property<int>("Id")
|
||||||
|
.ValueGeneratedOnAdd()
|
||||||
|
.HasColumnType("integer");
|
||||||
|
|
||||||
|
NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
|
||||||
|
|
||||||
|
b.Property<string>("StartDate")
|
||||||
|
.IsRequired()
|
||||||
|
.HasColumnType("text");
|
||||||
|
|
||||||
|
b.Property<string>("SubscriptionType")
|
||||||
|
.IsRequired()
|
||||||
|
.HasColumnType("text");
|
||||||
|
|
||||||
|
b.Property<int>("WorldId")
|
||||||
|
.HasColumnType("integer");
|
||||||
|
|
||||||
|
b.HasKey("Id");
|
||||||
|
|
||||||
|
b.HasIndex("WorldId");
|
||||||
|
|
||||||
|
b.ToTable("Subscriptions");
|
||||||
|
});
|
||||||
|
|
||||||
|
modelBuilder.Entity("Minecraft_Realms_Emulator.Entities.World", b =>
|
||||||
|
{
|
||||||
|
b.Property<int>("Id")
|
||||||
|
.ValueGeneratedOnAdd()
|
||||||
|
.HasColumnType("integer");
|
||||||
|
|
||||||
|
NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
|
||||||
|
|
||||||
|
b.Property<int>("ActiveSlot")
|
||||||
|
.HasColumnType("integer");
|
||||||
|
|
||||||
|
b.Property<int>("DaysLeft")
|
||||||
|
.HasColumnType("integer");
|
||||||
|
|
||||||
|
b.Property<bool>("Expired")
|
||||||
|
.HasColumnType("boolean");
|
||||||
|
|
||||||
|
b.Property<bool>("ExpiredTrial")
|
||||||
|
.HasColumnType("boolean");
|
||||||
|
|
||||||
|
b.Property<int>("MaxPlayers")
|
||||||
|
.HasColumnType("integer");
|
||||||
|
|
||||||
|
b.Property<bool>("Member")
|
||||||
|
.HasColumnType("boolean");
|
||||||
|
|
||||||
|
b.Property<int?>("MinigameId")
|
||||||
|
.HasColumnType("integer");
|
||||||
|
|
||||||
|
b.Property<string>("MinigameImage")
|
||||||
|
.HasColumnType("text");
|
||||||
|
|
||||||
|
b.Property<string>("MinigameName")
|
||||||
|
.HasColumnType("text");
|
||||||
|
|
||||||
|
b.Property<string>("Motd")
|
||||||
|
.HasColumnType("text");
|
||||||
|
|
||||||
|
b.Property<string>("Name")
|
||||||
|
.HasColumnType("text");
|
||||||
|
|
||||||
|
b.Property<string>("Owner")
|
||||||
|
.HasColumnType("text");
|
||||||
|
|
||||||
|
b.Property<string>("OwnerUUID")
|
||||||
|
.HasColumnType("text");
|
||||||
|
|
||||||
|
b.Property<string[]>("Players")
|
||||||
|
.IsRequired()
|
||||||
|
.HasColumnType("text[]");
|
||||||
|
|
||||||
|
b.Property<string>("RemoteSubscriptionId")
|
||||||
|
.IsRequired()
|
||||||
|
.HasColumnType("text");
|
||||||
|
|
||||||
|
b.Property<JsonDocument[]>("Slots")
|
||||||
|
.IsRequired()
|
||||||
|
.HasColumnType("jsonb[]");
|
||||||
|
|
||||||
|
b.Property<string>("State")
|
||||||
|
.IsRequired()
|
||||||
|
.HasColumnType("text");
|
||||||
|
|
||||||
|
b.Property<string>("WorldType")
|
||||||
|
.IsRequired()
|
||||||
|
.HasColumnType("text");
|
||||||
|
|
||||||
|
b.HasKey("Id");
|
||||||
|
|
||||||
|
b.ToTable("Worlds");
|
||||||
|
});
|
||||||
|
|
||||||
|
modelBuilder.Entity("Minecraft_Realms_Emulator.Entities.Connection", b =>
|
||||||
|
{
|
||||||
|
b.HasOne("Minecraft_Realms_Emulator.Entities.World", "World")
|
||||||
|
.WithMany()
|
||||||
|
.HasForeignKey("WorldId")
|
||||||
|
.OnDelete(DeleteBehavior.Cascade)
|
||||||
|
.IsRequired();
|
||||||
|
|
||||||
|
b.Navigation("World");
|
||||||
|
});
|
||||||
|
|
||||||
|
modelBuilder.Entity("Minecraft_Realms_Emulator.Entities.Subscription", b =>
|
||||||
|
{
|
||||||
|
b.HasOne("Minecraft_Realms_Emulator.Entities.World", "World")
|
||||||
|
.WithMany()
|
||||||
|
.HasForeignKey("WorldId")
|
||||||
|
.OnDelete(DeleteBehavior.Cascade)
|
||||||
|
.IsRequired();
|
||||||
|
|
||||||
|
b.Navigation("World");
|
||||||
|
});
|
||||||
|
#pragma warning restore 612, 618
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
@ -0,0 +1,60 @@
|
|||||||
|
using Microsoft.EntityFrameworkCore.Migrations;
|
||||||
|
|
||||||
|
#nullable disable
|
||||||
|
|
||||||
|
namespace Minecraft_Realms_Emulator.Migrations
|
||||||
|
{
|
||||||
|
/// <inheritdoc />
|
||||||
|
public partial class Subscription_v2 : Migration
|
||||||
|
{
|
||||||
|
/// <inheritdoc />
|
||||||
|
protected override void Up(MigrationBuilder migrationBuilder)
|
||||||
|
{
|
||||||
|
migrationBuilder.DropColumn(
|
||||||
|
name: "RemoteId",
|
||||||
|
table: "Subscriptions");
|
||||||
|
|
||||||
|
migrationBuilder.RenameColumn(
|
||||||
|
name: "DaysLeft",
|
||||||
|
table: "Subscriptions",
|
||||||
|
newName: "WorldId");
|
||||||
|
|
||||||
|
migrationBuilder.CreateIndex(
|
||||||
|
name: "IX_Subscriptions_WorldId",
|
||||||
|
table: "Subscriptions",
|
||||||
|
column: "WorldId");
|
||||||
|
|
||||||
|
migrationBuilder.AddForeignKey(
|
||||||
|
name: "FK_Subscriptions_Worlds_WorldId",
|
||||||
|
table: "Subscriptions",
|
||||||
|
column: "WorldId",
|
||||||
|
principalTable: "Worlds",
|
||||||
|
principalColumn: "Id",
|
||||||
|
onDelete: ReferentialAction.Cascade);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <inheritdoc />
|
||||||
|
protected override void Down(MigrationBuilder migrationBuilder)
|
||||||
|
{
|
||||||
|
migrationBuilder.DropForeignKey(
|
||||||
|
name: "FK_Subscriptions_Worlds_WorldId",
|
||||||
|
table: "Subscriptions");
|
||||||
|
|
||||||
|
migrationBuilder.DropIndex(
|
||||||
|
name: "IX_Subscriptions_WorldId",
|
||||||
|
table: "Subscriptions");
|
||||||
|
|
||||||
|
migrationBuilder.RenameColumn(
|
||||||
|
name: "WorldId",
|
||||||
|
table: "Subscriptions",
|
||||||
|
newName: "DaysLeft");
|
||||||
|
|
||||||
|
migrationBuilder.AddColumn<string>(
|
||||||
|
name: "RemoteId",
|
||||||
|
table: "Subscriptions",
|
||||||
|
type: "text",
|
||||||
|
nullable: false,
|
||||||
|
defaultValue: "");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
@ -48,13 +48,6 @@ namespace Minecraft_Realms_Emulator.Migrations
|
|||||||
|
|
||||||
NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
|
NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
|
||||||
|
|
||||||
b.Property<int>("DaysLeft")
|
|
||||||
.HasColumnType("integer");
|
|
||||||
|
|
||||||
b.Property<string>("RemoteId")
|
|
||||||
.IsRequired()
|
|
||||||
.HasColumnType("text");
|
|
||||||
|
|
||||||
b.Property<string>("StartDate")
|
b.Property<string>("StartDate")
|
||||||
.IsRequired()
|
.IsRequired()
|
||||||
.HasColumnType("text");
|
.HasColumnType("text");
|
||||||
@ -63,8 +56,13 @@ namespace Minecraft_Realms_Emulator.Migrations
|
|||||||
.IsRequired()
|
.IsRequired()
|
||||||
.HasColumnType("text");
|
.HasColumnType("text");
|
||||||
|
|
||||||
|
b.Property<int>("WorldId")
|
||||||
|
.HasColumnType("integer");
|
||||||
|
|
||||||
b.HasKey("Id");
|
b.HasKey("Id");
|
||||||
|
|
||||||
|
b.HasIndex("WorldId");
|
||||||
|
|
||||||
b.ToTable("Subscriptions");
|
b.ToTable("Subscriptions");
|
||||||
});
|
});
|
||||||
|
|
||||||
@ -150,6 +148,17 @@ namespace Minecraft_Realms_Emulator.Migrations
|
|||||||
|
|
||||||
b.Navigation("World");
|
b.Navigation("World");
|
||||||
});
|
});
|
||||||
|
|
||||||
|
modelBuilder.Entity("Minecraft_Realms_Emulator.Entities.Subscription", b =>
|
||||||
|
{
|
||||||
|
b.HasOne("Minecraft_Realms_Emulator.Entities.World", "World")
|
||||||
|
.WithMany()
|
||||||
|
.HasForeignKey("WorldId")
|
||||||
|
.OnDelete(DeleteBehavior.Cascade)
|
||||||
|
.IsRequired();
|
||||||
|
|
||||||
|
b.Navigation("World");
|
||||||
|
});
|
||||||
#pragma warning restore 612, 618
|
#pragma warning restore 612, 618
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
9
Minecraft-Realms-Emulator/Responses/Subscription.cs
Normal file
9
Minecraft-Realms-Emulator/Responses/Subscription.cs
Normal file
@ -0,0 +1,9 @@
|
|||||||
|
namespace Minecraft_Realms_Emulator.Responses
|
||||||
|
{
|
||||||
|
public class Subscription
|
||||||
|
{
|
||||||
|
public string StartDate { get; set; }
|
||||||
|
public int DaysLeft { get; set; }
|
||||||
|
public string SubscriptionType { get; set; }
|
||||||
|
}
|
||||||
|
}
|
@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"ConnectionStrings": {
|
"ConnectionStrings": {
|
||||||
"DefaultConnection": "User Id=postgres.aquqykciubzfolgrftwa;Password=SNYcLhJsLGiWeB2K;Server=aws-0-us-west-1.pooler.supabase.com;Port=5432;Database=postgres"
|
"DefaultConnection": "User Id=postgres.aquqykciubzfolgrftwa;Password=z6hmYsiCl0f7HzUr;Server=aws-0-us-west-1.pooler.supabase.com;Port=5432;Database=postgres"
|
||||||
},
|
},
|
||||||
"Logging": {
|
"Logging": {
|
||||||
"LogLevel": {
|
"LogLevel": {
|
||||||
|
Loading…
Reference in New Issue
Block a user