event stored procedure

Author: eskinderg

src/app/fragments/components/event/component/event-list-header/event-list-header.component.ts

@@ -21,7 +21,7 @@ export class EventListHeaderComponent {
 
     addEvent() {
         if (this.newEvent.title.length > 0) {
-            this.add.emit({ ...this.newEvent, id: v4() });
+            this.add.emit({ ...this.newEvent, event_id: v4() });
             this.newEvent = new Event(); // clear entry
         }
     }

src/app/fragments/components/event/component/event-list/event-list-item/event-list-item.component.ts

@@ -25,7 +25,7 @@ export class EventListItemComponent {
     constructor() {}
 
     onToggleEvent(event: Event) {
-        this.toggle.emit(event);
+        this.toggle.emit({ ...event, complete: !event.complete });
     }
 
     onSelectEvent(selected: boolean, event: Event) {

src/app/fragments/components/event/component/event.component.ts

@@ -49,7 +49,9 @@ export class EventComponent {
         if (item.selected) {
             this.selectedEvents.push(item.event);
         } else {
-            this.selectedEvents = this.selectedEvents.filter((e: Event) => e.id !== item.event.id);
+            this.selectedEvents = this.selectedEvents.filter(
+                (e: Event) => e.event_id !== item.event.event_id
+            );
         }
     }
 

src/app/fragments/components/event/event.data.service/event.data.service.ts

@@ -17,33 +17,29 @@ export class EventDataService extends ApiService {
     }
 
     public createEvent(event: Event): Observable<Event> {
-        return this.http.post<Event>(EVENTS_API_URL, event);
+        // return this.http.post<Event[]>(EVENTS_API_URL, event).pipe(map((response) => response.shift()));
+        return this.updateEvent(event);
     }
 
     public getEventById(eventId: number): Observable<Event> {
         return this.http.get<Event>(EVENTS_API_URL + eventId);
     }
 
     public updateEvent(event: Event): Observable<Event> {
-        return this.http.put<Event>(EVENTS_API_URL, event).pipe(
+        return this.http.put<Event[]>(EVENTS_API_URL + '/upsert', [event]).pipe(
             map((response) => {
-                return response;
+                return response.shift();
             }),
             catchError(this.handleError)
         );
     }
 
     public toggleEvent(event: Event): Observable<Event> {
-        return this.http.put<Event>(EVENTS_API_URL + '/toggle', event).pipe(
-            map((response) => {
-                return response;
-            }),
-            catchError(this.handleError)
-        );
+        return this.updateEvent(event);
     }
 
     public deleteEventById(event: Event): Observable<Event> {
-        return this.http.delete<Event>(EVENTS_API_URL + '/' + event.id).pipe(
+        return this.http.delete<Event>(EVENTS_API_URL + '/' + event.event_id).pipe(
             map(() => {
                 return event;
             }),

src/app/fragments/components/event/event.ts

@@ -1,7 +1,8 @@
 export class Event {
-    id: string;
+    event_id: string;
     title: string = '';
     complete = false;
+    user_id: string;
 
     constructor(values: object = {}) {
         Object.assign(this, values);

src/app/store/reducers/events.reducer.ts

@@ -40,7 +40,7 @@ export const eventsReducer = createReducer<IEventsState>(
         (state, action): IEventsState => ({
             ...state,
             events: state.events.map((event) => {
-                return event.id === action.event.id ? action.event : event;
+                return event.event_id === action.event.event_id ? action.event : event;
             })
         })
     ),
@@ -49,7 +49,7 @@ export const eventsReducer = createReducer<IEventsState>(
         (state, action): IEventsState => ({
             ...state,
             events: state.events.filter((event: Event) => {
-                return event.id !== action.event.id;
+                return event.event_id !== action.event.event_id;
             })
         })
     ),
@@ -60,7 +60,7 @@ export const eventsReducer = createReducer<IEventsState>(
         (state, action): IEventsState => ({
             ...state,
             events: state.events.filter((event: Event) => {
-                return action.events.every((e) => e.id !== event.id);
+                return action.events.every((e) => e.event_id !== event.event_id);
             })
         })
     )
@@ -78,7 +78,7 @@ export const getItemById = (id: string) =>
     createSelector(getEventState, (allItems) => {
         if (allItems.events) {
             return allItems.events.find((item) => {
-                return item.id === id;
+                return item.event_id === id;
             });
         } else {
             return {};