Introduce event categories
Closes #1056 Signed-off-by: Thomas Citharel <tcit@tcit.fr>
This commit is contained in:
parent
762d20213a
commit
00c3212950
@ -17,7 +17,8 @@ span.tag {
|
||||
background: $purple-3;
|
||||
color: $violet-2;
|
||||
text-transform: uppercase;
|
||||
&::before {
|
||||
|
||||
&:not(.category)::before {
|
||||
content: "#";
|
||||
}
|
||||
}
|
||||
|
@ -23,6 +23,7 @@ const FULL_EVENT_FRAGMENT = gql`
|
||||
joinOptions
|
||||
draft
|
||||
language
|
||||
category
|
||||
picture {
|
||||
id
|
||||
url
|
||||
@ -203,7 +204,7 @@ export const CREATE_EVENT = gql`
|
||||
$picture: MediaInput
|
||||
$onlineAddress: String
|
||||
$phoneAddress: String
|
||||
$category: String
|
||||
$category: EventCategory
|
||||
$physicalAddress: AddressInput
|
||||
$options: EventOptionsInput
|
||||
$contacts: [Contact]
|
||||
@ -253,7 +254,7 @@ export const EDIT_EVENT = gql`
|
||||
$phoneAddress: String
|
||||
$organizerActorId: ID
|
||||
$attributedToId: ID
|
||||
$category: String
|
||||
$category: EventCategory
|
||||
$physicalAddress: AddressInput
|
||||
$options: EventOptionsInput
|
||||
$contacts: [Contact]
|
||||
|
@ -11,6 +11,7 @@ export const SEARCH_EVENTS_AND_GROUPS = gql`
|
||||
$tags: String
|
||||
$term: String
|
||||
$type: EventType
|
||||
$category: String
|
||||
$beginsOn: DateTime
|
||||
$endsOn: DateTime
|
||||
$eventPage: Int
|
||||
@ -23,6 +24,7 @@ export const SEARCH_EVENTS_AND_GROUPS = gql`
|
||||
tags: $tags
|
||||
term: $term
|
||||
type: $type
|
||||
category: $category
|
||||
beginsOn: $beginsOn
|
||||
endsOn: $endsOn
|
||||
page: $eventPage
|
||||
|
@ -1306,5 +1306,23 @@
|
||||
"IP Address": "IP Address",
|
||||
"Last seen on": "Last seen on",
|
||||
"No user matches the filters": "No user matches the filters",
|
||||
"Reset filters": "Reset filters"
|
||||
"Reset filters": "Reset filters",
|
||||
"Arts": "Arts",
|
||||
"Book Clubs": "Book Clubs",
|
||||
"Business": "Business",
|
||||
"Causes": "Causes",
|
||||
"Comedy": "Comedy",
|
||||
"Crafts": "Crafts",
|
||||
"Food & Drink": "Food & Drink",
|
||||
"Health": "Health",
|
||||
"Music": "Music",
|
||||
"Auto, Boat & Air": "Auto, Boat & Air",
|
||||
"Community": "Community",
|
||||
"Family & Education": "Family & Education",
|
||||
"Fashion & Beauty": "Fashion & Beauty",
|
||||
"Film & Media": "Film & Media",
|
||||
"Games": "Games",
|
||||
"Category": "Category",
|
||||
"Select a category": "Select a category",
|
||||
"Any category": "Any category"
|
||||
}
|
||||
|
@ -1305,5 +1305,23 @@
|
||||
"{timezoneLongName} ({timezoneShortName})": "{timezoneLongName} ({timezoneShortName})",
|
||||
"{title} ({count} todos)": "{title} ({count} todos)",
|
||||
"{username} was invited to {group}": "{username} a été invité à {group}",
|
||||
"© The OpenStreetMap Contributors": "© Les Contributeur⋅ices OpenStreetMap"
|
||||
"© The OpenStreetMap Contributors": "© Les Contributeur⋅ices OpenStreetMap",
|
||||
"Arts": "Arts",
|
||||
"Book Clubs": "Clubs de lecture",
|
||||
"Business": "Entreprises",
|
||||
"Causes": "Causes",
|
||||
"Comedy": "Comédie",
|
||||
"Crafts": "Artisanat",
|
||||
"Food & Drink": "Alimentation et boissons",
|
||||
"Health": "Santé",
|
||||
"Music": "Musique",
|
||||
"Auto, Boat & Air": "Automobile, bateaux et aéronautique",
|
||||
"Community": "Communauté",
|
||||
"Family & Education": "Famille et éducation",
|
||||
"Fashion & Beauty": "Mode et beauté",
|
||||
"Film & Media": "Films et médias",
|
||||
"Games": "Jeux",
|
||||
"Category": "Catégorie",
|
||||
"Select a category": "Choisissez une categorie",
|
||||
"Any category": "N'importe quelle catégorie"
|
||||
}
|
||||
|
@ -72,14 +72,6 @@ export enum EventVisibilityJoinOptions {
|
||||
LIMITED = "LIMITED",
|
||||
}
|
||||
|
||||
export enum Category {
|
||||
BUSINESS = "business",
|
||||
CONFERENCE = "conference",
|
||||
BIRTHDAY = "birthday",
|
||||
DEMONSTRATION = "demonstration",
|
||||
MEETING = "meeting",
|
||||
}
|
||||
|
||||
export enum LoginErrorCode {
|
||||
NEED_TO_LOGIN = "need_to_login",
|
||||
}
|
||||
|
@ -53,6 +53,7 @@ interface IEventEditJSON {
|
||||
options: IEventOptions;
|
||||
contacts: { id?: string }[];
|
||||
metadata: IEventMetadata[];
|
||||
category: string;
|
||||
}
|
||||
|
||||
export interface IEvent {
|
||||
@ -91,6 +92,7 @@ export interface IEvent {
|
||||
metadata: IEventMetadata[];
|
||||
contacts: IActor[];
|
||||
language: string;
|
||||
category: string;
|
||||
|
||||
toEditJSON(): IEventEditJSON;
|
||||
}
|
||||
@ -166,6 +168,8 @@ export class EventModel implements IEvent {
|
||||
|
||||
metadata: IEventMetadata[] = [];
|
||||
|
||||
category = "MEETING";
|
||||
|
||||
constructor(hash?: IEvent | IEditableEvent) {
|
||||
if (!hash) return;
|
||||
|
||||
@ -214,6 +218,7 @@ export class EventModel implements IEvent {
|
||||
this.tags = hash.tags;
|
||||
this.metadata = hash.metadata;
|
||||
this.language = hash.language;
|
||||
this.category = hash.category;
|
||||
if (hash.options) this.options = hash.options;
|
||||
}
|
||||
|
||||
@ -240,6 +245,7 @@ export function toEditJSON(event: IEditableEvent): IEventEditJSON {
|
||||
beginsOn: event.beginsOn ? event.beginsOn.toISOString() : null,
|
||||
endsOn: event.endsOn ? event.endsOn.toISOString() : null,
|
||||
status: event.status,
|
||||
category: event.category,
|
||||
visibility: event.visibility,
|
||||
joinOptions: event.joinOptions,
|
||||
draft: event.draft,
|
||||
|
68
js/src/utils/categories.ts
Normal file
68
js/src/utils/categories.ts
Normal file
@ -0,0 +1,68 @@
|
||||
import { i18n } from "@/utils/i18n";
|
||||
|
||||
export const eventCategories = [
|
||||
{
|
||||
id: "ARTS",
|
||||
label: i18n.t("Arts"),
|
||||
icon: "palette",
|
||||
},
|
||||
{
|
||||
id: "BOOK_CLUBS",
|
||||
label: i18n.t("Book Clubs"),
|
||||
icon: "favourite-book",
|
||||
},
|
||||
{
|
||||
id: "BUSINESS",
|
||||
label: i18n.t("Business"),
|
||||
},
|
||||
{
|
||||
id: "CAUSES",
|
||||
label: i18n.t("Causes"),
|
||||
},
|
||||
{
|
||||
id: "COMEDY",
|
||||
label: i18n.t("Comedy"),
|
||||
},
|
||||
{
|
||||
id: "CRAFTS",
|
||||
label: i18n.t("Crafts"),
|
||||
},
|
||||
{
|
||||
id: "FOOD_DRINK",
|
||||
label: i18n.t("Food & Drink"),
|
||||
},
|
||||
{
|
||||
id: "HEALTH",
|
||||
label: i18n.t("Health"),
|
||||
},
|
||||
{
|
||||
id: "MUSIC",
|
||||
label: i18n.t("Music"),
|
||||
},
|
||||
{
|
||||
id: "AUTO_BOAT_AIR",
|
||||
label: i18n.t("Auto, Boat & Air"),
|
||||
},
|
||||
{
|
||||
id: "COMMUNITY",
|
||||
label: i18n.t("Community"),
|
||||
},
|
||||
{
|
||||
id: "FAMILY_EDUCATION",
|
||||
label: i18n.t("Family & Education"),
|
||||
},
|
||||
{
|
||||
id: "FASHION_BEAUTY",
|
||||
label: i18n.t("Fashion & Beauty"),
|
||||
},
|
||||
{
|
||||
id: "FILM_MEDIA",
|
||||
label: i18n.t("Film & Media"),
|
||||
},
|
||||
{
|
||||
id: "GAMES",
|
||||
label: i18n.t("Games"),
|
||||
},
|
||||
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
|
||||
// @ts-ignore
|
||||
].sort(({ label: label1 }, { label: label2 }) => label1.localeCompare(label2));
|
@ -32,7 +32,28 @@
|
||||
/>
|
||||
</b-field>
|
||||
|
||||
<tag-input v-model="event.tags" />
|
||||
<div class="flex flex-wrap gap-4">
|
||||
<b-field
|
||||
:label="$t('Category')"
|
||||
label-for="category"
|
||||
class="w-full md:max-w-fit"
|
||||
>
|
||||
<b-select
|
||||
:placeholder="$t('Select a category')"
|
||||
v-model="event.category"
|
||||
expanded
|
||||
>
|
||||
<option
|
||||
v-for="category in eventCategories"
|
||||
:value="category.id"
|
||||
:key="category.id"
|
||||
>
|
||||
{{ category.label }}
|
||||
</option>
|
||||
</b-select>
|
||||
</b-field>
|
||||
<tag-input v-model="event.tags" class="flex-1" />
|
||||
</div>
|
||||
|
||||
<b-field
|
||||
horizontal
|
||||
@ -643,6 +664,7 @@ import { USER_SETTINGS } from "@/graphql/user";
|
||||
import { IUser } from "@/types/current-user.model";
|
||||
import { IAddress } from "@/types/address.model";
|
||||
import { LOGGED_USER_PARTICIPATIONS } from "@/graphql/participant";
|
||||
import { eventCategories } from "@/utils/categories";
|
||||
|
||||
const DEFAULT_LIMIT_NUMBER_OF_PLACES = 10;
|
||||
|
||||
@ -752,6 +774,8 @@ export default class EditEvent extends Vue {
|
||||
|
||||
formatList = formatList;
|
||||
|
||||
eventCategories = eventCategories;
|
||||
|
||||
@Watch("eventId", { immediate: true })
|
||||
resetFormForCreation(eventId: string): void {
|
||||
if (eventId === undefined) {
|
||||
@ -1058,22 +1082,6 @@ export default class EditEvent extends Vue {
|
||||
options: this.eventOptions,
|
||||
};
|
||||
|
||||
console.debug(this.event.beginsOn?.toISOString());
|
||||
|
||||
// if (this.event.beginsOn && this.timezone) {
|
||||
// console.debug(
|
||||
// "begins on should be",
|
||||
// zonedTimeToUtc(this.event.beginsOn, this.timezone).toISOString()
|
||||
// );
|
||||
// }
|
||||
|
||||
// if (this.event.beginsOn && this.timezone) {
|
||||
// res.beginsOn = zonedTimeToUtc(
|
||||
// this.event.beginsOn,
|
||||
// this.timezone
|
||||
// ).toISOString();
|
||||
// }
|
||||
|
||||
const organizerActor = this.event.organizerActor?.id
|
||||
? this.event.organizerActor
|
||||
: this.organizerActor;
|
||||
|
@ -44,11 +44,10 @@
|
||||
</popover-actor-card>
|
||||
</span>
|
||||
</div>
|
||||
<p
|
||||
class="tags"
|
||||
v-if="event.tags && event.tags.length > 0"
|
||||
dir="auto"
|
||||
>
|
||||
<p class="tags" dir="auto">
|
||||
<tag v-if="eventCategory" class="category">{{
|
||||
eventCategory
|
||||
}}</tag>
|
||||
<router-link
|
||||
v-for="tag in event.tags"
|
||||
:key="tag.title"
|
||||
@ -508,6 +507,7 @@ import { IEventMetadataDescription } from "@/types/event-metadata";
|
||||
import { eventMetaDataList } from "../../services/EventMetadata";
|
||||
import { USER_SETTINGS } from "@/graphql/user";
|
||||
import { IUser } from "@/types/current-user.model";
|
||||
import { eventCategories } from "@/utils/categories";
|
||||
|
||||
// noinspection TypeScriptValidateTypes
|
||||
@Component({
|
||||
@ -1133,6 +1133,15 @@ export default class Event extends EventMixin {
|
||||
get routingType(): string | undefined {
|
||||
return this.config?.maps?.routing?.type;
|
||||
}
|
||||
|
||||
get eventCategory(): string | undefined {
|
||||
if (this.event?.category === "MEETING") {
|
||||
return undefined;
|
||||
}
|
||||
return eventCategories.find((eventCategory) => {
|
||||
return eventCategory.id === this.event?.category;
|
||||
})?.label as string;
|
||||
}
|
||||
}
|
||||
</script>
|
||||
<style lang="scss" scoped>
|
||||
|
@ -92,6 +92,30 @@
|
||||
</option>
|
||||
</b-select>
|
||||
</b-field>
|
||||
<b-field
|
||||
expanded
|
||||
:label="$t('Category')"
|
||||
label-for="category"
|
||||
class="searchCategory"
|
||||
>
|
||||
<b-select
|
||||
expanded
|
||||
v-model="eventCategory"
|
||||
id="category"
|
||||
:disabled="activeTab !== 0"
|
||||
>
|
||||
<option :value="null">
|
||||
{{ $t("Any category") }}
|
||||
</option>
|
||||
<option
|
||||
:value="category.id"
|
||||
v-for="category in eventCategories"
|
||||
:key="category.id"
|
||||
>
|
||||
{{ category.label }}
|
||||
</option>
|
||||
</b-select>
|
||||
</b-field>
|
||||
</form>
|
||||
</div>
|
||||
</section>
|
||||
@ -223,6 +247,7 @@ import { REVERSE_GEOCODE } from "../graphql/address";
|
||||
import debounce from "lodash/debounce";
|
||||
import { CURRENT_USER_CLIENT } from "@/graphql/user";
|
||||
import { ICurrentUser } from "@/types/current-user.model";
|
||||
import { eventCategories } from "@/utils/categories";
|
||||
|
||||
interface ISearchTimeOption {
|
||||
label: string;
|
||||
@ -364,6 +389,8 @@ export default class Search extends Vue {
|
||||
|
||||
GROUP_PAGE_LIMIT = GROUP_PAGE_LIMIT;
|
||||
|
||||
eventCategories = eventCategories;
|
||||
|
||||
$refs!: {
|
||||
aac: FullAddressAutoComplete;
|
||||
autocompleteSearchInput: any;
|
||||
@ -511,6 +538,23 @@ export default class Search extends Vue {
|
||||
});
|
||||
}
|
||||
|
||||
get eventCategory(): string | null {
|
||||
return (this.$route.query.eventCategory as string) || null;
|
||||
}
|
||||
|
||||
set eventCategory(eventCategory: string | null) {
|
||||
let query = { ...this.$route.query, eventCategory };
|
||||
if (query.eventCategory === null) {
|
||||
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
|
||||
// @ts-ignore
|
||||
delete query.eventCategory;
|
||||
}
|
||||
this.$router.replace({
|
||||
name: RouteName.SEARCH,
|
||||
query,
|
||||
});
|
||||
}
|
||||
|
||||
get weekend(): { start: Date; end: Date } {
|
||||
const now = new Date();
|
||||
const endOfWeekDate = endOfWeek(now, { locale: this.$dateFnsLocale });
|
||||
@ -644,36 +688,16 @@ h3.title {
|
||||
}
|
||||
|
||||
form {
|
||||
// ::v-deep .field label.label {
|
||||
// margin-bottom: 0;
|
||||
// }
|
||||
|
||||
// .field.is-expanded:last-child > .field-body > .field.is-grouped {
|
||||
// flex-wrap: wrap;
|
||||
// flex: 1;
|
||||
// .field {
|
||||
// flex: 1 0 auto;
|
||||
// &:first-child {
|
||||
// flex: 3 0 300px;
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
display: grid;
|
||||
grid-gap: 0 15px;
|
||||
grid-template-areas: "query" "location" "radius" "date" "type";
|
||||
grid-template-areas: "query" "location" "radius" "date" "type" "category";
|
||||
|
||||
& > * {
|
||||
margin-bottom: 0 !important;
|
||||
}
|
||||
|
||||
@include tablet {
|
||||
grid-template-columns: max-content max-content max-content auto;
|
||||
grid-template-areas: "query . ." "location . ." "radius date type";
|
||||
}
|
||||
|
||||
@include desktop {
|
||||
grid-template-columns: max-content max-content max-content 1fr 3fr;
|
||||
grid-template-areas: "query . location" "radius date type";
|
||||
grid-template-areas: "query . ." "location radius ." "date type category";
|
||||
}
|
||||
|
||||
.searchQuery {
|
||||
@ -683,7 +707,7 @@ form {
|
||||
}
|
||||
@include desktop {
|
||||
grid-column-start: 1;
|
||||
grid-column-end: 4;
|
||||
grid-column-end: 5;
|
||||
}
|
||||
}
|
||||
|
||||
@ -696,21 +720,41 @@ form {
|
||||
grid-column: span 4;
|
||||
}
|
||||
@include desktop {
|
||||
grid-column-start: 4;
|
||||
grid-column-end: 7;
|
||||
grid-column-start: 1;
|
||||
grid-column-end: 4;
|
||||
}
|
||||
}
|
||||
|
||||
.searchRadius {
|
||||
grid-area: radius;
|
||||
@include desktop {
|
||||
grid-column-start: 4;
|
||||
grid-column-end: 5;
|
||||
}
|
||||
}
|
||||
|
||||
.searchDate {
|
||||
grid-area: date;
|
||||
@include desktop {
|
||||
grid-column-start: 1;
|
||||
grid-column-end: 2;
|
||||
}
|
||||
}
|
||||
|
||||
.searchType {
|
||||
grid-area: type;
|
||||
@include desktop {
|
||||
grid-column-start: 2;
|
||||
grid-column-end: 3;
|
||||
}
|
||||
}
|
||||
|
||||
.searchCategory {
|
||||
grid-area: category;
|
||||
@include desktop {
|
||||
grid-column-start: 3;
|
||||
grid-column-end: 5;
|
||||
}
|
||||
}
|
||||
}
|
||||
</style>
|
||||
|
@ -22,12 +22,15 @@ defmodule Mobilizon.GraphQL.Schema do
|
||||
alias Mobilizon.Events.{Event, Participant}
|
||||
alias Mobilizon.GraphQL.Middleware.{CurrentActorProvider, ErrorHandler}
|
||||
alias Mobilizon.GraphQL.Schema
|
||||
alias Mobilizon.GraphQL.Schema.Custom
|
||||
alias Mobilizon.Storage.Repo
|
||||
|
||||
@pipeline_modifier Custom.EnumTypes
|
||||
|
||||
import_types(Absinthe.Type.Custom)
|
||||
import_types(Absinthe.Plug.Types)
|
||||
import_types(Schema.Custom.UUID)
|
||||
import_types(Schema.Custom.Point)
|
||||
import_types(Custom.UUID)
|
||||
import_types(Custom.Point)
|
||||
|
||||
import_types(Schema.ActivityType)
|
||||
import_types(Schema.UserType)
|
||||
|
109
lib/graphql/schema/custom/enum_types.ex
Normal file
109
lib/graphql/schema/custom/enum_types.ex
Normal file
@ -0,0 +1,109 @@
|
||||
defmodule Mobilizon.GraphQL.Schema.Custom.EnumTypes do
|
||||
alias Absinthe.Blueprint.Schema
|
||||
alias Absinthe.Schema.Notation
|
||||
alias Absinthe.{Blueprint, Pipeline, Phase}
|
||||
|
||||
@categories [
|
||||
%{
|
||||
id: :arts,
|
||||
label: "ARTS"
|
||||
},
|
||||
%{
|
||||
id: :book_clubs,
|
||||
label: "BOOK_CLUBS"
|
||||
},
|
||||
%{
|
||||
id: :business,
|
||||
label: "BUSINESS"
|
||||
},
|
||||
%{
|
||||
id: :causes,
|
||||
label: "CAUSES"
|
||||
},
|
||||
%{
|
||||
id: :comedy,
|
||||
label: "COMEDY"
|
||||
},
|
||||
%{
|
||||
id: :crafts,
|
||||
label: "CRAFTS"
|
||||
},
|
||||
%{
|
||||
id: :food_drink,
|
||||
label: "FOOD_DRINK"
|
||||
},
|
||||
%{
|
||||
id: :health,
|
||||
label: "HEALTH"
|
||||
},
|
||||
%{
|
||||
id: :music,
|
||||
label: "MUSIC"
|
||||
},
|
||||
%{
|
||||
id: :auto_boat_air,
|
||||
label: "AUTO_BOAT_AIR"
|
||||
},
|
||||
%{
|
||||
id: :community,
|
||||
label: "COMMUNITY"
|
||||
},
|
||||
%{
|
||||
id: :family_education,
|
||||
label: "FAMILY_EDUCATION"
|
||||
},
|
||||
%{
|
||||
id: :fashion_beauty,
|
||||
label: "FASHION_BEAUTY"
|
||||
},
|
||||
%{
|
||||
id: :film_media,
|
||||
label: "FILM_MEDIA"
|
||||
},
|
||||
%{
|
||||
id: :games,
|
||||
label: "GAMES"
|
||||
},
|
||||
# Legacy default value
|
||||
%{
|
||||
id: :meeting,
|
||||
label: "MEETING"
|
||||
}
|
||||
]
|
||||
|
||||
def pipeline(pipeline) do
|
||||
Pipeline.insert_after(pipeline, Phase.Schema.TypeImports, __MODULE__)
|
||||
end
|
||||
|
||||
def run(blueprint = %Blueprint{}, _) do
|
||||
%{schema_definitions: [schema]} = blueprint
|
||||
|
||||
new_enum = build_dynamic_enum()
|
||||
|
||||
schema =
|
||||
Map.update!(schema, :type_definitions, fn type_definitions ->
|
||||
[new_enum | type_definitions]
|
||||
end)
|
||||
|
||||
{:ok, %{blueprint | schema_definitions: [schema]}}
|
||||
end
|
||||
|
||||
def build_dynamic_enum() do
|
||||
%Schema.EnumTypeDefinition{
|
||||
name: "EventCategory",
|
||||
identifier: :event_category,
|
||||
module: __MODULE__,
|
||||
__reference__: Notation.build_reference(__ENV__),
|
||||
values:
|
||||
Enum.map(@categories, fn %{id: id, label: label} ->
|
||||
%Schema.EnumValueDefinition{
|
||||
identifier: id,
|
||||
value: label,
|
||||
name: label,
|
||||
module: __MODULE__,
|
||||
__reference__: Notation.build_reference(__ENV__)
|
||||
}
|
||||
end)
|
||||
}
|
||||
end
|
||||
end
|
@ -66,7 +66,7 @@ defmodule Mobilizon.GraphQL.Schema.EventType do
|
||||
description: "The event's tags"
|
||||
)
|
||||
|
||||
field(:category, :string, description: "The event's category")
|
||||
field(:category, :event_category, description: "The event's category")
|
||||
|
||||
field(:draft, :boolean, description: "Whether or not the event is a draft")
|
||||
|
||||
@ -399,7 +399,11 @@ defmodule Mobilizon.GraphQL.Schema.EventType do
|
||||
|
||||
arg(:attributed_to_id, :id, description: "Who the event is attributed to ID (often a group)")
|
||||
|
||||
arg(:category, :string, default_value: "meeting", description: "The event's category")
|
||||
arg(:category, :event_category,
|
||||
default_value: "MEETING",
|
||||
description: "The event's category"
|
||||
)
|
||||
|
||||
arg(:physical_address, :address_input, description: "The event's physical address")
|
||||
arg(:options, :event_options_input, default_value: %{}, description: "The event options")
|
||||
arg(:metadata, list_of(:event_metadata_input), description: "The event metadata")
|
||||
@ -448,7 +452,7 @@ defmodule Mobilizon.GraphQL.Schema.EventType do
|
||||
|
||||
arg(:attributed_to_id, :id, description: "Who the event is attributed to ID (often a group)")
|
||||
|
||||
arg(:category, :string, description: "The event's category")
|
||||
arg(:category, :event_category, description: "The event's category")
|
||||
arg(:physical_address, :address_input, description: "The event's physical address")
|
||||
arg(:options, :event_options_input, description: "The event options")
|
||||
arg(:metadata, list_of(:event_metadata_input), description: "The event metadata")
|
||||
|
@ -93,6 +93,7 @@ defmodule Mobilizon.GraphQL.Schema.SearchType do
|
||||
arg(:tags, :string, description: "A comma-separated string listing the tags")
|
||||
arg(:location, :string, description: "A geohash for coordinates")
|
||||
arg(:type, :event_type, description: "Whether the event is online or in person")
|
||||
arg(:category, :string, description: "The category for the event")
|
||||
|
||||
arg(:radius, :float,
|
||||
default_value: 50,
|
||||
|
@ -54,14 +54,6 @@ defmodule Mobilizon.Events do
|
||||
:cancelled
|
||||
])
|
||||
|
||||
defenum(EventCategory, :event_category, [
|
||||
:business,
|
||||
:conference,
|
||||
:birthday,
|
||||
:demonstration,
|
||||
:meeting
|
||||
])
|
||||
|
||||
defenum(ParticipantRole, :participant_role, [
|
||||
:not_approved,
|
||||
:not_confirmed,
|
||||
@ -536,6 +528,7 @@ defmodule Mobilizon.Events do
|
||||
|> events_for_search_query()
|
||||
|> events_for_begins_on(args)
|
||||
|> events_for_ends_on(args)
|
||||
|> events_for_category(args)
|
||||
|> events_for_tags(args)
|
||||
|> events_for_location(args)
|
||||
|> filter_online(args)
|
||||
@ -1313,6 +1306,13 @@ defmodule Mobilizon.Events do
|
||||
end
|
||||
end
|
||||
|
||||
@spec events_for_category(Ecto.Queryable.t(), map()) :: Ecto.Query.t()
|
||||
defp events_for_category(query, %{category: category}) when is_valid_string(category) do
|
||||
where(query, [q], q.category == ^category)
|
||||
end
|
||||
|
||||
defp events_for_category(query, _args), do: query
|
||||
|
||||
@spec events_for_tags(Ecto.Queryable.t(), map()) :: Ecto.Query.t()
|
||||
defp events_for_tags(query, %{tags: tags}) when is_valid_string(tags) do
|
||||
query
|
||||
|
1
mix.exs
1
mix.exs
@ -299,7 +299,6 @@ defmodule Mobilizon.Mixfile do
|
||||
Mobilizon.Events.Tag,
|
||||
Mobilizon.Events.TagRelations,
|
||||
Mobilizon.Events.Track,
|
||||
Mobilizon.Events.EventCategory,
|
||||
Mobilizon.Events.EventStatus,
|
||||
Mobilizon.Events.EventVisibility,
|
||||
Mobilizon.Events.JoinOptions,
|
||||
|
@ -0,0 +1,11 @@
|
||||
defmodule Mobilizon.Storage.Repo.Migrations.SetAllEventsCategoryToMeeting do
|
||||
use Ecto.Migration
|
||||
|
||||
def up do
|
||||
Ecto.Migration.execute("UPDATE events SET category = 'MEETING'")
|
||||
end
|
||||
|
||||
def down do
|
||||
Ecto.Migration.execute("UPDATE events SET category = 'meeting' WHERE category = 'MEETING'")
|
||||
end
|
||||
end
|
@ -21,7 +21,7 @@ defmodule Mobilizon.Web.Resolvers.EventTest do
|
||||
begins_on: DateTime.utc_now() |> DateTime.truncate(:second),
|
||||
uuid: "b5126423-f1af-43e4-a923-002a03003ba4",
|
||||
url: "some url",
|
||||
category: "meeting"
|
||||
category: "MEETING"
|
||||
}
|
||||
|
||||
@find_event_query """
|
||||
|
@ -20,7 +20,7 @@ defmodule Mobilizon.GraphQL.Resolvers.ParticipantTest do
|
||||
|> DateTime.truncate(:second),
|
||||
uuid: "b5126423-f1af-43e4-a923-002a03003ba4",
|
||||
url: "some url",
|
||||
category: "meeting",
|
||||
category: "MEETING",
|
||||
options: %{}
|
||||
}
|
||||
|
||||
|
@ -17,7 +17,7 @@ defmodule Mobilizon.EventsTest do
|
||||
title: "some title",
|
||||
url: "some url",
|
||||
uuid: "b5126423-f1af-43e4-a923-002a03003ba4",
|
||||
category: "meeting"
|
||||
category: "MEETING"
|
||||
}
|
||||
|
||||
describe "list_events/5" do
|
||||
|
Loading…
Reference in New Issue
Block a user