From bb71da402017fd28878fa696e140c6de1f44c1a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrej=20Rama=C5=A1euski?= <andrej@x2.cz>
Date: Sat, 5 Feb 2022 19:10:25 +0100
Subject: [PATCH] Cleanup
---
lib/CF/Schema/Result/Announcement.pm | 1 +
lib/CF/Schema/Result/Event.pm | 10 ++++++++++
lib/CF/Schema/Result/Socket.pm | 27 ---------------------------
lib/CF/Schema/Result/Socket_view.pm | 18 ------------------
openapi.yaml | 2 +-
sql/10/up.sql | 3 +++
6 files changed, 15 insertions(+), 46 deletions(-)
delete mode 100644 lib/CF/Schema/Result/Socket.pm
delete mode 100644 lib/CF/Schema/Result/Socket_view.pm
create mode 100644 sql/10/up.sql
diff --git a/lib/CF/Schema/Result/Announcement.pm b/lib/CF/Schema/Result/Announcement.pm
index bf12c5b..9f050e7 100644
--- a/lib/CF/Schema/Result/Announcement.pm
+++ b/lib/CF/Schema/Result/Announcement.pm
@@ -17,6 +17,7 @@ __PACKAGE__->add_columns(
sequence => 'uid_seq'
},
qw(
+ event_id
datetime
deleted
user_id
diff --git a/lib/CF/Schema/Result/Event.pm b/lib/CF/Schema/Result/Event.pm
index 471c1f6..fb1e8ad 100644
--- a/lib/CF/Schema/Result/Event.pm
+++ b/lib/CF/Schema/Result/Event.pm
@@ -47,6 +47,16 @@ __PACKAGE__->has_many(
{ 'foreign.event_id' => 'self.id', },
);
+__PACKAGE__->has_many(
+ program_entries => 'CF::Schema::Result::ProgramEntry',
+ { 'foreign.event_id' => 'self.id', },
+);
+
+__PACKAGE__->has_many(
+ announcements => 'CF::Schema::Result::Announcement',
+ { 'foreign.event_id' => 'self.id', },
+);
+
__PACKAGE__->set_primary_key('id');
sub format ($self) {
diff --git a/lib/CF/Schema/Result/Socket.pm b/lib/CF/Schema/Result/Socket.pm
deleted file mode 100644
index 943bc77..0000000
--- a/lib/CF/Schema/Result/Socket.pm
+++ /dev/null
@@ -1,27 +0,0 @@
-package CF::Schema::Result::Socket;
-
-use strict;
-use warnings;
-
-use base 'DBIx::Class::Core';
-
-our $VERSION = 1;
-
-__PACKAGE__->table('sockets');
-
-__PACKAGE__->add_columns(
- qw(
- id
- ip
- user_id
- keepalive
- ),
-);
-
-__PACKAGE__->set_primary_key('id');
-
-__PACKAGE__->add_unique_constraint(
- 'user' => [qw(user_id)]
-);
-
-1;
diff --git a/lib/CF/Schema/Result/Socket_view.pm b/lib/CF/Schema/Result/Socket_view.pm
deleted file mode 100644
index aeaed9d..0000000
--- a/lib/CF/Schema/Result/Socket_view.pm
+++ /dev/null
@@ -1,18 +0,0 @@
-package CF::Schema::Result::Socket_view;
-
-use strict;
-use warnings;
-
-use base 'CF::Schema::Result::Socket';
-
-our $VERSION = 1;
-
-__PACKAGE__->table('sockets_view');
-
-__PACKAGE__->add_columns(
- qw(
- is_member
- ),
-);
-
-1;
diff --git a/openapi.yaml b/openapi.yaml
index 743704f..aada47b 100644
--- a/openapi.yaml
+++ b/openapi.yaml
@@ -1,7 +1,7 @@
openapi: 3.0.3
info:
- version: "2.8.0"
+ version: "2.9.0"
title: CF Online
description: CF Online
license:
diff --git a/sql/10/up.sql b/sql/10/up.sql
new file mode 100644
index 0000000..ec1eeae
--- /dev/null
+++ b/sql/10/up.sql
@@ -0,0 +1,3 @@
+drop view "sockets_view";
+drop table "sockets";
+alter table "announcements" add column "event_id" integer;
--
GitLab