From d8131c21c09d7df8abe416a4ef2fcc176af8c7c1 Mon Sep 17 00:00:00 2001
From: Thomas Citharel <tcit@tcit.fr>
Date: Fri, 1 Feb 2019 12:33:15 +0100
Subject: [PATCH 1/2] Split event visibility and join options

Signed-off-by: Thomas Citharel <tcit@tcit.fr>

Fix tests

Signed-off-by: Thomas Citharel <tcit@tcit.fr>

Fix format

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
---
 js/src/types/event.model.ts                   | 16 ++++++++--
 js/src/views/Event/Create.vue                 | 28 +++++++---------
 lib/mobilizon/events/event.ex                 | 10 ++++--
 ...plit_event_visibility_and_join_options.exs | 32 +++++++++++++++++++
 .../resolvers/event_resolver_test.exs         |  3 +-
 5 files changed, 67 insertions(+), 22 deletions(-)
 create mode 100644 priv/repo/migrations/20190130151607_split_event_visibility_and_join_options.exs

diff --git a/js/src/types/event.model.ts b/js/src/types/event.model.ts
index 9e5b25a49..011cd41dd 100644
--- a/js/src/types/event.model.ts
+++ b/js/src/types/event.model.ts
@@ -1,11 +1,22 @@
 import { IActor } from "./actor.model";
 
 export enum EventStatus {
-    TENTATIVE, CONFIRMED, CANCELLED
+    TENTATIVE,
+    CONFIRMED,
+    CANCELLED
 }
 
 export enum EventVisibility {
-    PUBLIC, PRIVATE
+    PUBLIC,
+    UNLISTED,
+    RESTRICTED,
+    PRIVATE
+}
+
+export enum EventJoinOptions {
+    FREE,
+    RESTRICTED,
+    INVITE
 }
 
 export enum ParticipantRole {
@@ -34,6 +45,7 @@ export interface IEvent {
     ends_on: Date;
     status: EventStatus;
     visibility: EventVisibility;
+    join_options: EventJoinOptions;
     thumbnail: string;
     large_image: string;
     publish_at: Date;
diff --git a/js/src/views/Event/Create.vue b/js/src/views/Event/Create.vue
index b22b24a0b..b674f9f66 100644
--- a/js/src/views/Event/Create.vue
+++ b/js/src/views/Event/Create.vue
@@ -1,3 +1,4 @@
+import {EventJoinOptions} from "../../types/event.model";
 <template>
   <section>
     <h1 class="title">
@@ -31,22 +32,16 @@
 </template>
 
 <script lang="ts">
-// import Location from '@/components/Location';
-import VueMarkdown from "vue-markdown";
-import { CREATE_EVENT, EDIT_EVENT } from "@/graphql/event";
-import { FETCH_CATEGORIES } from "@/graphql/category";
-import { AUTH_USER_ACTOR } from "@/constants";
-import { Component, Prop, Vue } from "vue-property-decorator";
-import {
-  IEvent,
-  ICategory,
-  EventVisibility,
-  EventStatus
-} from "../../types/event.model";
-import { LOGGED_PERSON } from "../../graphql/actor";
-import { IPerson } from "../../types/actor.model";
+  // import Location from '@/components/Location';
+  import VueMarkdown from "vue-markdown";
+  import {CREATE_EVENT, EDIT_EVENT} from "@/graphql/event";
+  import {FETCH_CATEGORIES} from "@/graphql/category";
+  import {Component, Prop, Vue} from "vue-property-decorator";
+  import {EventJoinOptions, EventStatus, EventVisibility, ICategory, IEvent} from "@/types/event.model";
+  import {LOGGED_PERSON} from "@/graphql/actor";
+  import {IPerson} from "@/types/actor.model";
 
-@Component({
+  @Component({
   components: {
     VueMarkdown
   },
@@ -70,7 +65,7 @@ export default class CreateEvent extends Vue {
   // }
 
   async created() {
-    // We put initialization here because we need loggedPerson to be ready before initalizing event
+    // We put initialization here because we need loggedPerson to be ready before initializing event
     const { data } = await this.$apollo.query({ query: LOGGED_PERSON });
 
     this.loggedPerson = data.loggedPerson;
@@ -89,6 +84,7 @@ export default class CreateEvent extends Vue {
       local: true,
       status: EventStatus.CONFIRMED,
       visibility: EventVisibility.PUBLIC,
+      join_options: EventJoinOptions.FREE,
       thumbnail: "",
       large_image: "",
       publish_at: new Date()
diff --git a/lib/mobilizon/events/event.ex b/lib/mobilizon/events/event.ex
index c8ce770ad..d795f40c6 100644
--- a/lib/mobilizon/events/event.ex
+++ b/lib/mobilizon/events/event.ex
@@ -3,8 +3,13 @@ import EctoEnum
 defenum(Mobilizon.Events.EventVisibilityEnum, :event_visibility_type, [
   :public,
   :unlisted,
-  :private,
-  :moderated,
+  :restricted,
+  :private
+])
+
+defenum(Mobilizon.Events.JoinOptionsEnum, :event_join_options_type, [
+  :free,
+  :restricted,
   :invite
 ])
 
@@ -33,6 +38,7 @@ defmodule Mobilizon.Events.Event do
     field(:title, :string)
     field(:status, Mobilizon.Events.EventStatusEnum, default: :confirmed)
     field(:visibility, Mobilizon.Events.EventVisibilityEnum, default: :public)
+    field(:join_options, Mobilizon.Events.JoinOptionsEnum, default: :free)
     field(:thumbnail, :string)
     field(:large_image, :string)
     field(:publish_at, Timex.Ecto.DateTimeWithTimezone)
diff --git a/priv/repo/migrations/20190130151607_split_event_visibility_and_join_options.exs b/priv/repo/migrations/20190130151607_split_event_visibility_and_join_options.exs
new file mode 100644
index 000000000..de1486660
--- /dev/null
+++ b/priv/repo/migrations/20190130151607_split_event_visibility_and_join_options.exs
@@ -0,0 +1,32 @@
+defmodule Mobilizon.Repo.Migrations.SplitEventVisibilityAndJoinOptions do
+  use Ecto.Migration
+  alias Mobilizon.Events.EventVisibilityEnum
+  alias Mobilizon.Events.JoinOptionsEnum
+
+  @doc """
+  EventVisibilityEnum has dropped some possible values, so we need to recreate it
+  """
+  def up do
+    execute "ALTER TABLE events ALTER COLUMN visibility TYPE VARCHAR USING visibility::text"
+    EventVisibilityEnum.drop_type
+    EventVisibilityEnum.create_type
+    execute "ALTER TABLE events ALTER COLUMN visibility TYPE event_visibility_type USING visibility::event_visibility_type"
+
+    JoinOptionsEnum.create_type
+    alter table(:events) do
+      add(:join_options, JoinOptionsEnum.type(), null: false, default: "free")
+    end
+  end
+
+  def down do
+    alter table(:events) do
+      remove(:join_options)
+    end
+    JoinOptionsEnum.drop_type
+
+    execute "ALTER TABLE events ALTER COLUMN visibility TYPE VARCHAR USING visibility::text"
+    EventVisibilityEnum.drop_type
+    EventVisibilityEnum.create_type
+    execute "ALTER TABLE events ALTER COLUMN visibility TYPE event_visibility_type USING visibility::event_visibility_type"
+  end
+end
diff --git a/test/mobilizon_web/resolvers/event_resolver_test.exs b/test/mobilizon_web/resolvers/event_resolver_test.exs
index 13181ff23..96d8329ea 100644
--- a/test/mobilizon_web/resolvers/event_resolver_test.exs
+++ b/test/mobilizon_web/resolvers/event_resolver_test.exs
@@ -249,8 +249,7 @@ defmodule MobilizonWeb.Resolvers.EventResolverTest do
     test "list_events/3 doesn't list private events", context do
       insert(:event, visibility: :private)
       insert(:event, visibility: :unlisted)
-      insert(:event, visibility: :moderated)
-      insert(:event, visibility: :invite)
+      insert(:event, visibility: :restricted)
 
       query = """
       {

From f01819e6637399d4b132aa8591e055c66d43dac6 Mon Sep 17 00:00:00 2001
From: Thomas Citharel <tcit@tcit.fr>
Date: Thu, 7 Feb 2019 14:01:38 +0100
Subject: [PATCH 2/2] Set visibility field default to null

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
---
 ...0130151607_split_event_visibility_and_join_options.exs | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/priv/repo/migrations/20190130151607_split_event_visibility_and_join_options.exs b/priv/repo/migrations/20190130151607_split_event_visibility_and_join_options.exs
index de1486660..c1857e3fb 100644
--- a/priv/repo/migrations/20190130151607_split_event_visibility_and_join_options.exs
+++ b/priv/repo/migrations/20190130151607_split_event_visibility_and_join_options.exs
@@ -5,6 +5,8 @@ defmodule Mobilizon.Repo.Migrations.SplitEventVisibilityAndJoinOptions do
 
   @doc """
   EventVisibilityEnum has dropped some possible values, so we need to recreate it
+
+  Visibility allowed nullable values previously
   """
   def up do
     execute "ALTER TABLE events ALTER COLUMN visibility TYPE VARCHAR USING visibility::text"
@@ -16,6 +18,12 @@ defmodule Mobilizon.Repo.Migrations.SplitEventVisibilityAndJoinOptions do
     alter table(:events) do
       add(:join_options, JoinOptionsEnum.type(), null: false, default: "free")
     end
+
+    execute "UPDATE events SET visibility = 'public' WHERE visibility IS NULL"
+
+    alter table(:events) do
+      modify(:visibility, EventVisibilityEnum.type(), null: false, default: "public")
+    end
   end
 
   def down do