fix

angular/openapi.yaml

@@ -1409,6 +1409,82 @@ paths:
           style: form
           explode: false
           allowReserved: false
+        -
+          name: trip
+          in: query
+          description: ''
+          required: false
+          deprecated: false
+          allowEmptyValue: false
+          schema:
+            type: string
+          style: form
+          explode: false
+          allowReserved: false
+        -
+          name: 'trip[]'
+          in: query
+          description: ''
+          required: false
+          deprecated: false
+          allowEmptyValue: false
+          schema:
+            type: array
+            items:
+              type: string
+          style: form
+          explode: true
+          allowReserved: false
+        -
+          name: user
+          in: query
+          description: ''
+          required: false
+          deprecated: false
+          allowEmptyValue: false
+          schema:
+            type: string
+          style: form
+          explode: false
+          allowReserved: false
+        -
+          name: 'user[]'
+          in: query
+          description: ''
+          required: false
+          deprecated: false
+          allowEmptyValue: false
+          schema:
+            type: array
+            items:
+              type: string
+          style: form
+          explode: true
+          allowReserved: false
+        -
+          name: custom_json_filter
+          in: query
+          description: ''
+          required: false
+          deprecated: false
+          allowEmptyValue: false
+          schema:
+            type: string
+          style: form
+          explode: false
+          allowReserved: false
+        -
+          name: custom_json_order
+          in: query
+          description: ''
+          required: false
+          deprecated: false
+          allowEmptyValue: false
+          schema:
+            type: string
+          style: form
+          explode: false
+          allowReserved: false
       deprecated: false
     post:
       operationId: api_user_trips_post
@@ -1533,6 +1609,155 @@ paths:
               $ref: '#/components/schemas/UserTrip'
         required: true
       deprecated: false
+  /api/user_trip_events:
+    get:
+      operationId: api_user_trip_events_get_collection
+      tags:
+        - UserTripEvent
+      responses:
+        '200':
+          description: 'UserTripEvent collection'
+          content:
+            application/ld+json:
+              schema:
+                type: object
+                properties:
+                  member: { type: array, items: { $ref: '#/components/schemas/UserTripEvent.jsonld' } }
+                  totalItems: { type: integer, minimum: 0 }
+                  view: { type: object, properties: { '@id': { type: string, format: iri-reference }, '@type': { type: string }, first: { type: string, format: iri-reference }, last: { type: string, format: iri-reference }, previous: { type: string, format: iri-reference }, next: { type: string, format: iri-reference } }, example: { '@id': string, type: string, first: string, last: string, previous: string, next: string } }
+                  search: { type: object, properties: { '@type': { type: string }, template: { type: string }, variableRepresentation: { type: string }, mapping: { type: array, items: { type: object, properties: { '@type': { type: string }, variable: { type: string }, property: { type: [string, 'null'] }, required: { type: boolean } } } } } }
+                required:
+                  - member
+      summary: 'Retrieves the collection of UserTripEvent resources.'
+      description: 'Retrieves the collection of UserTripEvent resources.'
+      parameters:
+        -
+          name: page
+          in: query
+          description: 'The collection page number'
+          required: false
+          deprecated: false
+          allowEmptyValue: true
+          schema:
+            type: integer
+            default: 1
+          style: form
+          explode: false
+          allowReserved: false
+        -
+          name: itemsPerPage
+          in: query
+          description: 'The number of items per page'
+          required: false
+          deprecated: false
+          allowEmptyValue: true
+          schema:
+            type: integer
+            default: 50
+            minimum: 0
+            maximum: 200
+          style: form
+          explode: false
+          allowReserved: false
+      deprecated: false
+    post:
+      operationId: api_user_trip_events_post
+      tags:
+        - UserTripEvent
+      responses:
+        '201':
+          description: 'UserTripEvent resource created'
+          content:
+            application/ld+json:
+              schema:
+                $ref: '#/components/schemas/UserTripEvent.jsonld'
+          links: {  }
+        '400':
+          description: 'Invalid input'
+        '422':
+          description: 'Unprocessable entity'
+      summary: 'Creates a UserTripEvent resource.'
+      description: 'Creates a UserTripEvent resource.'
+      parameters: []
+      requestBody:
+        description: 'The new UserTripEvent resource'
+        content:
+          application/ld+json:
+            schema:
+              $ref: '#/components/schemas/UserTripEvent.jsonld'
+        required: true
+      deprecated: false
+  '/api/user_trip_events/{id}':
+    get:
+      operationId: api_user_trip_events_id_get
+      tags:
+        - UserTripEvent
+      responses:
+        '200':
+          description: 'UserTripEvent resource'
+          content:
+            application/ld+json:
+              schema:
+                $ref: '#/components/schemas/UserTripEvent.jsonld'
+        '404':
+          description: 'Resource not found'
+      summary: 'Retrieves a UserTripEvent resource.'
+      description: 'Retrieves a UserTripEvent resource.'
+      parameters:
+        -
+          name: id
+          in: path
+          description: 'UserTripEvent identifier'
+          required: true
+          deprecated: false
+          allowEmptyValue: false
+          schema:
+            type: string
+          style: simple
+          explode: false
+          allowReserved: false
+      deprecated: false
+    patch:
+      operationId: api_user_trip_events_id_patch
+      tags:
+        - UserTripEvent
+      responses:
+        '200':
+          description: 'UserTripEvent resource updated'
+          content:
+            application/ld+json:
+              schema:
+                $ref: '#/components/schemas/UserTripEvent.jsonld'
+          links: {  }
+        '400':
+          description: 'Invalid input'
+        '422':
+          description: 'Unprocessable entity'
+        '404':
+          description: 'Resource not found'
+      summary: 'Updates the UserTripEvent resource.'
+      description: 'Updates the UserTripEvent resource.'
+      parameters:
+        -
+          name: id
+          in: path
+          description: 'UserTripEvent identifier'
+          required: true
+          deprecated: false
+          allowEmptyValue: false
+          schema:
+            type: string
+          style: simple
+          explode: false
+          allowReserved: false
+      requestBody:
+        description: 'The updated UserTripEvent resource'
+        content:
+          application/merge-patch+json:
+            schema:
+              $ref: '#/components/schemas/UserTripEvent'
+        required: true
+      deprecated: false
   /api/vessels:
     get:
       operationId: api_vessels_get_collection
@@ -1960,12 +2185,6 @@ components:
       description: ''
       deprecated: false
       properties:
-        '@id':
-          readOnly: true
-          type: string
-        '@type':
-          readOnly: true
-          type: string
         '@context':
           readOnly: true
           oneOf:
@@ -1983,6 +2202,12 @@ components:
                 - '@vocab'
                 - hydra
               additionalProperties: true
+        '@id':
+          readOnly: true
+          type: string
+        '@type':
+          readOnly: true
+          type: string
         dbId:
           readOnly: true
           type:
@@ -2630,6 +2855,93 @@ components:
         - captainName
         - startDate
         - endDate
+    UserTripEvent:
+      type: object
+      description: ''
+      deprecated: false
+      properties:
+        dbId:
+          readOnly: true
+          type:
+            - integer
+            - 'null'
+        userTrip:
+          readOnly: true
+          $ref: '#/components/schemas/UserTrip'
+        event:
+          readOnly: true
+          type: string
+          format: iri-reference
+          example: 'https://example.com/'
+        date:
+          type: string
+          format: date-time
+        note:
+          type:
+            - string
+            - 'null'
+        createdAt:
+          readOnly: true
+          type:
+            - string
+            - 'null'
+          format: date-time
+      required:
+        - date
+    UserTripEvent.jsonld:
+      type: object
+      description: ''
+      deprecated: false
+      properties:
+        '@context':
+          readOnly: true
+          oneOf:
+            -
+              type: string
+            -
+              type: object
+              properties:
+                '@vocab':
+                  type: string
+                hydra:
+                  type: string
+                  enum: ['http://www.w3.org/ns/hydra/core#']
+              required:
+                - '@vocab'
+                - hydra
+              additionalProperties: true
+        '@id':
+          readOnly: true
+          type: string
+        '@type':
+          readOnly: true
+          type: string
+        dbId:
+          readOnly: true
+          type:
+            - integer
+            - 'null'
+        userTrip:
+          readOnly: true
+          $ref: '#/components/schemas/UserTrip.jsonld'
+        event:
+          readOnly: true
+          $ref: '#/components/schemas/Event.jsonld'
+        date:
+          type: string
+          format: date-time
+        note:
+          type:
+            - string
+            - 'null'
+        createdAt:
+          readOnly: true
+          type:
+            - string
+            - 'null'
+          format: date-time
+      required:
+        - date
     Vessel:
       type: object
       description: ''

angular/src/app/_forms/apiForms.ts

@@ -148,6 +148,24 @@ export const userTripJsonldForm = new FormGroup({
   createdAt: new FormControl(null, [])
 });
 
+export const userTripEventForm = new FormGroup({
+  dbId: new FormControl(null, []),
+  userTrip: new FormControl(null, []),
+  event: new FormControl(null, []),
+  date: new FormControl(null, [Validators.required]),
+  note: new FormControl(null, []),
+  createdAt: new FormControl(null, [])
+});
+
+export const userTripEventJsonldForm = new FormGroup({
+  dbId: new FormControl(null, []),
+  userTrip: new FormControl(null, []),
+  event: new FormControl(null, []),
+  date: new FormControl(null, [Validators.required]),
+  note: new FormControl(null, []),
+  createdAt: new FormControl(null, [])
+});
+
 export const vesselForm = new FormGroup({
   dbId: new FormControl(null, []),
   name: new FormControl(null, [Validators.required]),

angular/src/app/core/api/v1/.openapi-generator/FILES

@@ -11,6 +11,7 @@ api/trip.service.ts
 api/tripLocation.service.ts
 api/user.service.ts
 api/userTrip.service.ts
+api/userTripEvent.service.ts
 api/vessel.service.ts
 api/zone.service.ts
 configuration.ts
@@ -26,6 +27,7 @@ model/apiMediaObjectsGetCollection200Response.ts
 model/apiShippingCompaniesGetCollection200Response.ts
 model/apiTripLocationsGetCollection200Response.ts
 model/apiTripsGetCollection200Response.ts
+model/apiUserTripEventsGetCollection200Response.ts
 model/apiUserTripsGetCollection200Response.ts
 model/apiUsersGetCollection200Response.ts
 model/apiVesselsGetCollection200Response.ts
@@ -48,6 +50,8 @@ model/tripLocationJsonld.ts
 model/user.ts
 model/userJsonld.ts
 model/userTrip.ts
+model/userTripEvent.ts
+model/userTripEventJsonld.ts
 model/userTripJsonld.ts
 model/vessel.ts
 model/vesselJsonld.ts

angular/src/app/core/api/v1/api/api.ts

@@ -16,8 +16,10 @@ export * from './user.service';
 import { UserService } from './user.service';
 export * from './userTrip.service';
 import { UserTripService } from './userTrip.service';
+export * from './userTripEvent.service';
+import { UserTripEventService } from './userTripEvent.service';
 export * from './vessel.service';
 import { VesselService } from './vessel.service';
 export * from './zone.service';
 import { ZoneService } from './zone.service';
-export const APIS = [AuthService, EventService, LocationService, MediaObjectService, ShippingCompanyService, TripService, TripLocationService, UserService, UserTripService, VesselService, ZoneService];
+export const APIS = [AuthService, EventService, LocationService, MediaObjectService, ShippingCompanyService, TripService, TripLocationService, UserService, UserTripService, UserTripEventService, VesselService, ZoneService];

angular/src/app/core/api/v1/api/userTrip.service.ts

@@ -100,13 +100,19 @@ export class UserTripService {
      * Retrieves the collection of UserTrip resources.
      * @param page The collection page number
      * @param itemsPerPage The number of items per page
+     * @param trip 
+     * @param trip2 
+     * @param user 
+     * @param user2 
+     * @param customJsonFilter 
+     * @param customJsonOrder 
      * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
      * @param reportProgress flag to report request and response progress.
      */
-    public userTripsGetCollection(page?: number, itemsPerPage?: number, observe?: 'body', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/ld+json', context?: HttpContext, transferCache?: boolean}): Observable<ApiUserTripsGetCollection200Response>;
-    public userTripsGetCollection(page?: number, itemsPerPage?: number, observe?: 'response', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/ld+json', context?: HttpContext, transferCache?: boolean}): Observable<HttpResponse<ApiUserTripsGetCollection200Response>>;
-    public userTripsGetCollection(page?: number, itemsPerPage?: number, observe?: 'events', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/ld+json', context?: HttpContext, transferCache?: boolean}): Observable<HttpEvent<ApiUserTripsGetCollection200Response>>;
-    public userTripsGetCollection(page?: number, itemsPerPage?: number, observe: any = 'body', reportProgress: boolean = false, options?: {httpHeaderAccept?: 'application/ld+json', context?: HttpContext, transferCache?: boolean}): Observable<any> {
+    public userTripsGetCollection(page?: number, itemsPerPage?: number, trip?: string, trip2?: Array<string>, user?: string, user2?: Array<string>, customJsonFilter?: string, customJsonOrder?: string, observe?: 'body', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/ld+json', context?: HttpContext, transferCache?: boolean}): Observable<ApiUserTripsGetCollection200Response>;
+    public userTripsGetCollection(page?: number, itemsPerPage?: number, trip?: string, trip2?: Array<string>, user?: string, user2?: Array<string>, customJsonFilter?: string, customJsonOrder?: string, observe?: 'response', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/ld+json', context?: HttpContext, transferCache?: boolean}): Observable<HttpResponse<ApiUserTripsGetCollection200Response>>;
+    public userTripsGetCollection(page?: number, itemsPerPage?: number, trip?: string, trip2?: Array<string>, user?: string, user2?: Array<string>, customJsonFilter?: string, customJsonOrder?: string, observe?: 'events', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/ld+json', context?: HttpContext, transferCache?: boolean}): Observable<HttpEvent<ApiUserTripsGetCollection200Response>>;
+    public userTripsGetCollection(page?: number, itemsPerPage?: number, trip?: string, trip2?: Array<string>, user?: string, user2?: Array<string>, customJsonFilter?: string, customJsonOrder?: string, observe: any = 'body', reportProgress: boolean = false, options?: {httpHeaderAccept?: 'application/ld+json', context?: HttpContext, transferCache?: boolean}): Observable<any> {
 
         let localVarQueryParameters = new HttpParams({encoder: this.encoder});
         if (page !== undefined && page !== null) {
@@ -117,6 +123,34 @@ export class UserTripService {
           localVarQueryParameters = this.addToHttpParams(localVarQueryParameters,
             <any>itemsPerPage, 'itemsPerPage');
         }
+        if (trip !== undefined && trip !== null) {
+          localVarQueryParameters = this.addToHttpParams(localVarQueryParameters,
+            <any>trip, 'trip');
+        }
+        if (trip2) {
+            trip2.forEach((element) => {
+                localVarQueryParameters = this.addToHttpParams(localVarQueryParameters,
+                  <any>element, 'trip[]');
+            })
+        }
+        if (user !== undefined && user !== null) {
+          localVarQueryParameters = this.addToHttpParams(localVarQueryParameters,
+            <any>user, 'user');
+        }
+        if (user2) {
+            user2.forEach((element) => {
+                localVarQueryParameters = this.addToHttpParams(localVarQueryParameters,
+                  <any>element, 'user[]');
+            })
+        }
+        if (customJsonFilter !== undefined && customJsonFilter !== null) {
+          localVarQueryParameters = this.addToHttpParams(localVarQueryParameters,
+            <any>customJsonFilter, 'custom_json_filter');
+        }
+        if (customJsonOrder !== undefined && customJsonOrder !== null) {
+          localVarQueryParameters = this.addToHttpParams(localVarQueryParameters,
+            <any>customJsonOrder, 'custom_json_order');
+        }
 
         let localVarHeaders = this.defaultHeaders;
 

angular/src/app/core/api/v1/api/userTripEvent.service.ts

@@ -0,0 +1,419 @@
+/**
+ * Imaq Platform
+ * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+/* tslint:disable:no-unused-variable member-ordering */
+
+import { Inject, Injectable, Optional }                      from '@angular/core';
+import { HttpClient, HttpHeaders, HttpParams,
+         HttpResponse, HttpEvent, HttpParameterCodec, HttpContext 
+        }       from '@angular/common/http';
+import { CustomHttpParameterCodec }                          from '../encoder';
+import { Observable }                                        from 'rxjs';
+
+// @ts-ignore
+import { ApiUserTripEventsGetCollection200Response } from '../model/apiUserTripEventsGetCollection200Response';
+// @ts-ignore
+import { UserTripEvent } from '../model/userTripEvent';
+// @ts-ignore
+import { UserTripEventJsonld } from '../model/userTripEventJsonld';
+
+// @ts-ignore
+import { BASE_PATH, COLLECTION_FORMATS }                     from '../variables';
+import { Configuration }                                     from '../configuration';
+
+
+
+@Injectable({
+  providedIn: 'root'
+})
+export class UserTripEventService {
+
+    protected basePath = 'http://localhost';
+    public defaultHeaders = new HttpHeaders();
+    public configuration = new Configuration();
+    public encoder: HttpParameterCodec;
+
+    constructor(protected httpClient: HttpClient, @Optional()@Inject(BASE_PATH) basePath: string|string[], @Optional() configuration: Configuration) {
+        if (configuration) {
+            this.configuration = configuration;
+        }
+        if (typeof this.configuration.basePath !== 'string') {
+            if (Array.isArray(basePath) && basePath.length > 0) {
+                basePath = basePath[0];
+            }
+
+            if (typeof basePath !== 'string') {
+                basePath = this.basePath;
+            }
+            this.configuration.basePath = basePath;
+        }
+        this.encoder = this.configuration.encoder || new CustomHttpParameterCodec();
+    }
+
+
+    // @ts-ignore
+    private addToHttpParams(httpParams: HttpParams, value: any, key?: string): HttpParams {
+        if (typeof value === "object" && value instanceof Date === false) {
+            httpParams = this.addToHttpParamsRecursive(httpParams, value);
+        } else {
+            httpParams = this.addToHttpParamsRecursive(httpParams, value, key);
+        }
+        return httpParams;
+    }
+
+    private addToHttpParamsRecursive(httpParams: HttpParams, value?: any, key?: string): HttpParams {
+        if (value == null) {
+            return httpParams;
+        }
+
+        if (typeof value === "object") {
+            if (Array.isArray(value)) {
+                (value as any[]).forEach( elem => httpParams = this.addToHttpParamsRecursive(httpParams, elem, key));
+            } else if (value instanceof Date) {
+                if (key != null) {
+                    httpParams = httpParams.append(key, (value as Date).toISOString().substring(0, 10));
+                } else {
+                   throw Error("key may not be null if value is Date");
+                }
+            } else {
+                Object.keys(value).forEach( k => httpParams = this.addToHttpParamsRecursive(
+                    httpParams, value[k], key != null ? `${key}.${k}` : k));
+            }
+        } else if (key != null) {
+            httpParams = httpParams.append(key, value);
+        } else {
+            throw Error("key may not be null if value is not object or array");
+        }
+        return httpParams;
+    }
+
+    /**
+     * Retrieves the collection of UserTripEvent resources.
+     * Retrieves the collection of UserTripEvent resources.
+     * @param page The collection page number
+     * @param itemsPerPage The number of items per page
+     * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
+     * @param reportProgress flag to report request and response progress.
+     */
+    public userTripEventsGetCollection(page?: number, itemsPerPage?: number, observe?: 'body', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/ld+json', context?: HttpContext, transferCache?: boolean}): Observable<ApiUserTripEventsGetCollection200Response>;
+    public userTripEventsGetCollection(page?: number, itemsPerPage?: number, observe?: 'response', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/ld+json', context?: HttpContext, transferCache?: boolean}): Observable<HttpResponse<ApiUserTripEventsGetCollection200Response>>;
+    public userTripEventsGetCollection(page?: number, itemsPerPage?: number, observe?: 'events', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/ld+json', context?: HttpContext, transferCache?: boolean}): Observable<HttpEvent<ApiUserTripEventsGetCollection200Response>>;
+    public userTripEventsGetCollection(page?: number, itemsPerPage?: number, observe: any = 'body', reportProgress: boolean = false, options?: {httpHeaderAccept?: 'application/ld+json', context?: HttpContext, transferCache?: boolean}): Observable<any> {
+
+        let localVarQueryParameters = new HttpParams({encoder: this.encoder});
+        if (page !== undefined && page !== null) {
+          localVarQueryParameters = this.addToHttpParams(localVarQueryParameters,
+            <any>page, 'page');
+        }
+        if (itemsPerPage !== undefined && itemsPerPage !== null) {
+          localVarQueryParameters = this.addToHttpParams(localVarQueryParameters,
+            <any>itemsPerPage, 'itemsPerPage');
+        }
+
+        let localVarHeaders = this.defaultHeaders;
+
+        let localVarCredential: string | undefined;
+        // authentication (JWT) required
+        localVarCredential = this.configuration.lookupCredential('JWT');
+        if (localVarCredential) {
+            localVarHeaders = localVarHeaders.set('Authorization', 'Bearer ' + localVarCredential);
+        }
+
+        let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept;
+        if (localVarHttpHeaderAcceptSelected === undefined) {
+            // to determine the Accept header
+            const httpHeaderAccepts: string[] = [
+                'application/ld+json'
+            ];
+            localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts);
+        }
+        if (localVarHttpHeaderAcceptSelected !== undefined) {
+            localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected);
+        }
+
+        let localVarHttpContext: HttpContext | undefined = options && options.context;
+        if (localVarHttpContext === undefined) {
+            localVarHttpContext = new HttpContext();
+        }
+
+        let localVarTransferCache: boolean | undefined = options && options.transferCache;
+        if (localVarTransferCache === undefined) {
+            localVarTransferCache = true;
+        }
+
+
+        let responseType_: 'text' | 'json' | 'blob' = 'json';
+        if (localVarHttpHeaderAcceptSelected) {
+            if (localVarHttpHeaderAcceptSelected.startsWith('text')) {
+                responseType_ = 'text';
+            } else if (this.configuration.isJsonMime(localVarHttpHeaderAcceptSelected)) {
+                responseType_ = 'json';
+            } else {
+                responseType_ = 'blob';
+            }
+        }
+
+        let localVarPath = `/api/user_trip_events`;
+        return this.httpClient.request<ApiUserTripEventsGetCollection200Response>('get', `${this.configuration.basePath}${localVarPath}`,
+            {
+                context: localVarHttpContext,
+                params: localVarQueryParameters,
+                responseType: <any>responseType_,
+                withCredentials: this.configuration.withCredentials,
+                headers: localVarHeaders,
+                observe: observe,
+                transferCache: localVarTransferCache,
+                reportProgress: reportProgress
+            }
+        );
+    }
+
+    /**
+     * Retrieves a UserTripEvent resource.
+     * Retrieves a UserTripEvent resource.
+     * @param id UserTripEvent identifier
+     * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
+     * @param reportProgress flag to report request and response progress.
+     */
+    public userTripEventsIdGet(id: string, observe?: 'body', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/ld+json', context?: HttpContext, transferCache?: boolean}): Observable<UserTripEventJsonld>;
+    public userTripEventsIdGet(id: string, observe?: 'response', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/ld+json', context?: HttpContext, transferCache?: boolean}): Observable<HttpResponse<UserTripEventJsonld>>;
+    public userTripEventsIdGet(id: string, observe?: 'events', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/ld+json', context?: HttpContext, transferCache?: boolean}): Observable<HttpEvent<UserTripEventJsonld>>;
+    public userTripEventsIdGet(id: string, observe: any = 'body', reportProgress: boolean = false, options?: {httpHeaderAccept?: 'application/ld+json', context?: HttpContext, transferCache?: boolean}): Observable<any> {
+        if (id === null || id === undefined) {
+            throw new Error('Required parameter id was null or undefined when calling userTripEventsIdGet.');
+        }
+
+        let localVarHeaders = this.defaultHeaders;
+
+        let localVarCredential: string | undefined;
+        // authentication (JWT) required
+        localVarCredential = this.configuration.lookupCredential('JWT');
+        if (localVarCredential) {
+            localVarHeaders = localVarHeaders.set('Authorization', 'Bearer ' + localVarCredential);
+        }
+
+        let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept;
+        if (localVarHttpHeaderAcceptSelected === undefined) {
+            // to determine the Accept header
+            const httpHeaderAccepts: string[] = [
+                'application/ld+json'
+            ];
+            localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts);
+        }
+        if (localVarHttpHeaderAcceptSelected !== undefined) {
+            localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected);
+        }
+
+        let localVarHttpContext: HttpContext | undefined = options && options.context;
+        if (localVarHttpContext === undefined) {
+            localVarHttpContext = new HttpContext();
+        }
+
+        let localVarTransferCache: boolean | undefined = options && options.transferCache;
+        if (localVarTransferCache === undefined) {
+            localVarTransferCache = true;
+        }
+
+
+        let responseType_: 'text' | 'json' | 'blob' = 'json';
+        if (localVarHttpHeaderAcceptSelected) {
+            if (localVarHttpHeaderAcceptSelected.startsWith('text')) {
+                responseType_ = 'text';
+            } else if (this.configuration.isJsonMime(localVarHttpHeaderAcceptSelected)) {
+                responseType_ = 'json';
+            } else {
+                responseType_ = 'blob';
+            }
+        }
+
+        let localVarPath = `/api/user_trip_events/${this.configuration.encodeParam({name: "id", value: id, in: "path", style: "simple", explode: false, dataType: "string", dataFormat: undefined})}`;
+        return this.httpClient.request<UserTripEventJsonld>('get', `${this.configuration.basePath}${localVarPath}`,
+            {
+                context: localVarHttpContext,
+                responseType: <any>responseType_,
+                withCredentials: this.configuration.withCredentials,
+                headers: localVarHeaders,
+                observe: observe,
+                transferCache: localVarTransferCache,
+                reportProgress: reportProgress
+            }
+        );
+    }
+
+    /**
+     * Updates the UserTripEvent resource.
+     * Updates the UserTripEvent resource.
+     * @param id UserTripEvent identifier
+     * @param userTripEvent The updated UserTripEvent resource
+     * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
+     * @param reportProgress flag to report request and response progress.
+     */
+    public userTripEventsIdPatch(id: string, userTripEvent: UserTripEvent, observe?: 'body', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/ld+json', context?: HttpContext, transferCache?: boolean}): Observable<UserTripEventJsonld>;
+    public userTripEventsIdPatch(id: string, userTripEvent: UserTripEvent, observe?: 'response', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/ld+json', context?: HttpContext, transferCache?: boolean}): Observable<HttpResponse<UserTripEventJsonld>>;
+    public userTripEventsIdPatch(id: string, userTripEvent: UserTripEvent, observe?: 'events', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/ld+json', context?: HttpContext, transferCache?: boolean}): Observable<HttpEvent<UserTripEventJsonld>>;
+    public userTripEventsIdPatch(id: string, userTripEvent: UserTripEvent, observe: any = 'body', reportProgress: boolean = false, options?: {httpHeaderAccept?: 'application/ld+json', context?: HttpContext, transferCache?: boolean}): Observable<any> {
+        if (id === null || id === undefined) {
+            throw new Error('Required parameter id was null or undefined when calling userTripEventsIdPatch.');
+        }
+        if (userTripEvent === null || userTripEvent === undefined) {
+            throw new Error('Required parameter userTripEvent was null or undefined when calling userTripEventsIdPatch.');
+        }
+
+        let localVarHeaders = this.defaultHeaders;
+
+        let localVarCredential: string | undefined;
+        // authentication (JWT) required
+        localVarCredential = this.configuration.lookupCredential('JWT');
+        if (localVarCredential) {
+            localVarHeaders = localVarHeaders.set('Authorization', 'Bearer ' + localVarCredential);
+        }
+
+        let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept;
+        if (localVarHttpHeaderAcceptSelected === undefined) {
+            // to determine the Accept header
+            const httpHeaderAccepts: string[] = [
+                'application/ld+json'
+            ];
+            localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts);
+        }
+        if (localVarHttpHeaderAcceptSelected !== undefined) {
+            localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected);
+        }
+
+        let localVarHttpContext: HttpContext | undefined = options && options.context;
+        if (localVarHttpContext === undefined) {
+            localVarHttpContext = new HttpContext();
+        }
+
+        let localVarTransferCache: boolean | undefined = options && options.transferCache;
+        if (localVarTransferCache === undefined) {
+            localVarTransferCache = true;
+        }
+
+
+        // to determine the Content-Type header
+        const consumes: string[] = [
+            'application/merge-patch+json'
+        ];
+        const httpContentTypeSelected: string | undefined = this.configuration.selectHeaderContentType(consumes);
+        if (httpContentTypeSelected !== undefined) {
+            localVarHeaders = localVarHeaders.set('Content-Type', httpContentTypeSelected);
+        }
+
+        let responseType_: 'text' | 'json' | 'blob' = 'json';
+        if (localVarHttpHeaderAcceptSelected) {
+            if (localVarHttpHeaderAcceptSelected.startsWith('text')) {
+                responseType_ = 'text';
+            } else if (this.configuration.isJsonMime(localVarHttpHeaderAcceptSelected)) {
+                responseType_ = 'json';
+            } else {
+                responseType_ = 'blob';
+            }
+        }
+
+        let localVarPath = `/api/user_trip_events/${this.configuration.encodeParam({name: "id", value: id, in: "path", style: "simple", explode: false, dataType: "string", dataFormat: undefined})}`;
+        return this.httpClient.request<UserTripEventJsonld>('patch', `${this.configuration.basePath}${localVarPath}`,
+            {
+                context: localVarHttpContext,
+                body: userTripEvent,
+                responseType: <any>responseType_,
+                withCredentials: this.configuration.withCredentials,
+                headers: localVarHeaders,
+                observe: observe,
+                transferCache: localVarTransferCache,
+                reportProgress: reportProgress
+            }
+        );
+    }
+
+    /**
+     * Creates a UserTripEvent resource.
+     * Creates a UserTripEvent resource.
+     * @param userTripEventJsonld The new UserTripEvent resource
+     * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
+     * @param reportProgress flag to report request and response progress.
+     */
+    public userTripEventsPost(userTripEventJsonld: UserTripEventJsonld, observe?: 'body', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/ld+json', context?: HttpContext, transferCache?: boolean}): Observable<UserTripEventJsonld>;
+    public userTripEventsPost(userTripEventJsonld: UserTripEventJsonld, observe?: 'response', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/ld+json', context?: HttpContext, transferCache?: boolean}): Observable<HttpResponse<UserTripEventJsonld>>;
+    public userTripEventsPost(userTripEventJsonld: UserTripEventJsonld, observe?: 'events', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/ld+json', context?: HttpContext, transferCache?: boolean}): Observable<HttpEvent<UserTripEventJsonld>>;
+    public userTripEventsPost(userTripEventJsonld: UserTripEventJsonld, observe: any = 'body', reportProgress: boolean = false, options?: {httpHeaderAccept?: 'application/ld+json', context?: HttpContext, transferCache?: boolean}): Observable<any> {
+        if (userTripEventJsonld === null || userTripEventJsonld === undefined) {
+            throw new Error('Required parameter userTripEventJsonld was null or undefined when calling userTripEventsPost.');
+        }
+
+        let localVarHeaders = this.defaultHeaders;
+
+        let localVarCredential: string | undefined;
+        // authentication (JWT) required
+        localVarCredential = this.configuration.lookupCredential('JWT');
+        if (localVarCredential) {
+            localVarHeaders = localVarHeaders.set('Authorization', 'Bearer ' + localVarCredential);
+        }
+
+        let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept;
+        if (localVarHttpHeaderAcceptSelected === undefined) {
+            // to determine the Accept header
+            const httpHeaderAccepts: string[] = [
+                'application/ld+json'
+            ];
+            localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts);
+        }
+        if (localVarHttpHeaderAcceptSelected !== undefined) {
+            localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected);
+        }
+
+        let localVarHttpContext: HttpContext | undefined = options && options.context;
+        if (localVarHttpContext === undefined) {
+            localVarHttpContext = new HttpContext();
+        }
+
+        let localVarTransferCache: boolean | undefined = options && options.transferCache;
+        if (localVarTransferCache === undefined) {
+            localVarTransferCache = true;
+        }
+
+
+        // to determine the Content-Type header
+        const consumes: string[] = [
+            'application/ld+json'
+        ];
+        const httpContentTypeSelected: string | undefined = this.configuration.selectHeaderContentType(consumes);
+        if (httpContentTypeSelected !== undefined) {
+            localVarHeaders = localVarHeaders.set('Content-Type', httpContentTypeSelected);
+        }
+
+        let responseType_: 'text' | 'json' | 'blob' = 'json';
+        if (localVarHttpHeaderAcceptSelected) {
+            if (localVarHttpHeaderAcceptSelected.startsWith('text')) {
+                responseType_ = 'text';
+            } else if (this.configuration.isJsonMime(localVarHttpHeaderAcceptSelected)) {
+                responseType_ = 'json';
+            } else {
+                responseType_ = 'blob';
+            }
+        }
+
+        let localVarPath = `/api/user_trip_events`;
+        return this.httpClient.request<UserTripEventJsonld>('post', `${this.configuration.basePath}${localVarPath}`,
+            {
+                context: localVarHttpContext,
+                body: userTripEventJsonld,
+                responseType: <any>responseType_,
+                withCredentials: this.configuration.withCredentials,
+                headers: localVarHeaders,
+                observe: observe,
+                transferCache: localVarTransferCache,
+                reportProgress: reportProgress
+            }
+        );
+    }
+
+}

angular/src/app/core/api/v1/model/apiUserTripEventsGetCollection200Response.ts

@@ -0,0 +1,23 @@
+/**
+ * Imaq Platform
+ * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+import { UserTripEventJsonld } from './userTripEventJsonld';
+import { ApiEventsGetCollection200ResponseSearch } from './apiEventsGetCollection200ResponseSearch';
+import { ApiEventsGetCollection200ResponseView } from './apiEventsGetCollection200ResponseView';
+
+
+export interface ApiUserTripEventsGetCollection200Response { 
+    member: Array<UserTripEventJsonld>;
+    totalItems?: number;
+    view?: ApiEventsGetCollection200ResponseView;
+    search?: ApiEventsGetCollection200ResponseSearch;
+}
+

angular/src/app/core/api/v1/model/eventJsonld.ts

@@ -16,9 +16,9 @@ import { EventJsonldContext } from './eventJsonldContext';
  * 
  */
 export interface EventJsonld { 
+    context?: EventJsonldContext;
     readonly id?: string;
     readonly type?: string;
-    context?: EventJsonldContext;
     readonly dbId?: number | null;
     name?: string;
     identifier?: string;

angular/src/app/core/api/v1/model/models.ts

@@ -7,6 +7,7 @@ export * from './apiMediaObjectsGetCollection200Response';
 export * from './apiShippingCompaniesGetCollection200Response';
 export * from './apiTripLocationsGetCollection200Response';
 export * from './apiTripsGetCollection200Response';
+export * from './apiUserTripEventsGetCollection200Response';
 export * from './apiUserTripsGetCollection200Response';
 export * from './apiUsersGetCollection200Response';
 export * from './apiVesselsGetCollection200Response';
@@ -28,6 +29,8 @@ export * from './tripLocationJsonld';
 export * from './user';
 export * from './userJsonld';
 export * from './userTrip';
+export * from './userTripEvent';
+export * from './userTripEventJsonld';
 export * from './userTripJsonld';
 export * from './vessel';
 export * from './vesselJsonld';

angular/src/app/core/api/v1/model/userTripEvent.ts

@@ -0,0 +1,26 @@
+/**
+ * Imaq Platform
+ * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+import { UserTrip } from './userTrip';
+
+
+/**
+ * 
+ */
+export interface UserTripEvent { 
+    readonly dbId?: number | null;
+    readonly userTrip?: UserTrip;
+    readonly event?: string;
+    date: string;
+    note?: string | null;
+    readonly createdAt?: string | null;
+}
+

angular/src/app/core/api/v1/model/userTripEventJsonld.ts

@@ -0,0 +1,31 @@
+/**
+ * Imaq Platform
+ * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+import { UserTripJsonld } from './userTripJsonld';
+import { EventJsonld } from './eventJsonld';
+import { EventJsonldContext } from './eventJsonldContext';
+
+
+/**
+ * 
+ */
+export interface UserTripEventJsonld { 
+    context?: EventJsonldContext;
+    readonly id?: string;
+    readonly type?: string;
+    readonly dbId?: number | null;
+    readonly userTrip?: UserTripJsonld;
+    readonly event?: EventJsonld;
+    date: string;
+    note?: string | null;
+    readonly createdAt?: string | null;
+}
+

httpdocs/src/ApiResource/UserTripEventApi.php

@@ -17,7 +17,7 @@ use Symfony\Component\Validator\Constraints as Assert;
 use Symfony\Component\PropertyInfo\Type;
 
 #[ApiResource(
-    shortName: 'UserTrip',
+    shortName: 'UserTripEvent',
     operations: [
         new Get(
             security: 'is_granted("ROLE_USER")'