generator-jhipster 8.2.0 → 8.2.1

package/dist/generators/angular/templates/src/main/webapp/app/entities/_entityFolder/route/_entityFile-routing-resolve.service.spec.ts.ejs

@@ -1,120 +0,0 @@
-<%#
- Copyright 2013-2023 the original author or authors from the JHipster project.
-
- This file is part of the JHipster project, see https://www.jhipster.tech/
- for more information.
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-      https://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--%>
-<%_
-const tsKeyId = this.generateTestEntityId(primaryKey.type);
-_%>
-import { TestBed } from '@angular/core/testing';
-import { HttpResponse } from '@angular/common/http';
-import { HttpClientTestingModule } from '@angular/common/http/testing';
-import { ActivatedRouteSnapshot, ActivatedRoute, Router, convertToParamMap } from '@angular/router';
-import { RouterTestingModule } from '@angular/router/testing';
-import { of } from 'rxjs';
-
-import { I<%= entityAngularName %> } from '../<%= entityFileName %>.model';
-import { <%= entityAngularName %>Service } from '../service/<%= entityFileName %>.service';
-
-import <%= entityInstance %>Resolve from './<%= entityFileName %>-routing-resolve.service';
-
-describe('<%= entityAngularName %> routing resolve service', () => {
-  let mockRouter: Router;
-  let mockActivatedRouteSnapshot: ActivatedRouteSnapshot;
-  let service: <%= entityAngularName %>Service;
-  let result<%= entityAngularName %>: I<%= entityAngularName %> | null | undefined;
-
-  beforeEach(() => {
-    TestBed.configureTestingModule({
-      imports: [HttpClientTestingModule, RouterTestingModule.withRoutes([])],
-      providers: [
-        {
-          provide: ActivatedRoute,
-          useValue: {
-            snapshot: {
-              paramMap: convertToParamMap({}),
-            },
-          },
-        },
-      ],
-    });
-    mockRouter = TestBed.inject(Router);
-    jest.spyOn(mockRouter, 'navigate').mockImplementation(() => Promise.resolve(true));
-    mockActivatedRouteSnapshot = TestBed.inject(ActivatedRoute).snapshot;
-    service = TestBed.inject(<%= entityAngularName %>Service);
-    result<%= entityAngularName %> = undefined;
-  });
-
-  describe('resolve', () => {
-    it('should return I<%= entityAngularName %> returned by find', () => {
-      // GIVEN
-      service.find = jest.fn(<%= primaryKey.name %> => of(new HttpResponse({ body: { <%= primaryKey.name %> } })));
-      mockActivatedRouteSnapshot.params = { <%= primaryKey.name %>: <%- tsKeyId %> };
-
-      // WHEN
-      TestBed.runInInjectionContext(() => {
-        <%= entityInstance %>Resolve(mockActivatedRouteSnapshot).subscribe({
-          next(result) {
-            result<%= entityAngularName %> = result;
-          },
-        });
-      });
-
-      // THEN
-      expect(service.find).toBeCalledWith(<%- tsKeyId %>);
-      expect(result<%= entityAngularName %>).toEqual({ <%= primaryKey.name %>: <%- tsKeyId %> });
-    });
-
-    it('should return null if id is not provided', () => {
-      // GIVEN
-      service.find = jest.fn();
-      mockActivatedRouteSnapshot.params = {};
-
-      // WHEN
-      TestBed.runInInjectionContext(() => {
-        <%= entityInstance %>Resolve(mockActivatedRouteSnapshot).subscribe({
-          next(result) {
-            result<%= entityAngularName %> = result;
-          },
-        });
-      });
-
-      // THEN
-      expect(service.find).not.toBeCalled();
-      expect(result<%= entityAngularName %>).toEqual(null);
-    });
-
-    it('should route to 404 page if data not found in server', () => {
-      // GIVEN
-      jest.spyOn(service, 'find').mockReturnValue(of(new HttpResponse<I<%= entityAngularName %>>({ body: null })));
-      mockActivatedRouteSnapshot.params = { <%= primaryKey.name %>: <%- tsKeyId %> };
-
-      // WHEN
-      TestBed.runInInjectionContext(() => {
-        <%= entityInstance %>Resolve(mockActivatedRouteSnapshot).subscribe({
-          next(result) {
-            result<%= entityAngularName %> = result;
-          },
-        });
-      });
-
-      // THEN
-      expect(service.find).toBeCalledWith(<%- tsKeyId %>);
-      expect(result<%= entityAngularName %>).toEqual(undefined);
-      expect(mockRouter.navigate).toHaveBeenCalledWith(['404']);
-    });
-  });
-});

package/dist/generators/angular/templates/src/main/webapp/app/entities/_entityFolder/route/_entityFile-routing-resolve.service.ts.ejs

@@ -1,47 +0,0 @@
-<%#
- Copyright 2013-2023 the original author or authors from the JHipster project.
-
- This file is part of the JHipster project, see https://www.jhipster.tech/
- for more information.
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-      https://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--%>
-import { inject } from '@angular/core';
-import { HttpResponse } from '@angular/common/http';
-import { ActivatedRouteSnapshot, Router } from '@angular/router';
-import { of, EMPTY, Observable } from 'rxjs';
-import { mergeMap } from 'rxjs/operators';
-
-import { I<%= entityAngularName %> } from '../<%= entityFileName %>.model';
-import { <%= entityAngularName %>Service } from '../service/<%= entityFileName %>.service';
-
-export const <%= entityInstance %>Resolve = (route: ActivatedRouteSnapshot): Observable<null | I<%= entityAngularName %>> => {
-  const id = route.params['<%= primaryKey.name %>'];
-  if (id) {
-    return inject(<%= entityAngularName %>Service)
-      .find(id)
-      .pipe(
-        mergeMap((<%= entityInstance %>: HttpResponse<I<%= entityAngularName %>>) => {
-          if (<%= entityInstance %>.body) {
-            return of(<%= entityInstance %>.body);
-          } else {
-            inject(Router).navigate(['404']);
-            return EMPTY;
-          }
-        })
-      );
-  }
-  return of(null);
-};
-
-export default <%= entityInstance %>Resolve;

package/dist/generators/angular/templates/src/main/webapp/app/entities/_entityFolder/service/_entityFile.service.spec.ts.ejs

@@ -1,255 +0,0 @@
-<%#
- Copyright 2013-2023 the original author or authors from the JHipster project.
-
- This file is part of the JHipster project, see https://www.jhipster.tech/
- for more information.
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-      https://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--%>
-<%_
-const tsKeyId = this.generateTestEntityId(primaryKey.type);
-const enumImports = this.generateEntityClientEnumImports(fields);
-_%>
-import { TestBed } from '@angular/core/testing';
-import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing';
-
-<%_ if (anyFieldIsLocalDate) { _%>
-import { DATE_FORMAT } from 'app/config/input.constants';
-<%_ } _%>
-import { I<%= entityAngularName %> } from '../<%= entityFileName %>.model';
-import { sampleWithRequiredData, sampleWithNewData, sampleWithPartialData, sampleWithFullData } from '../<%= entityFileName %>.test-samples';
-
-import { <%= entityAngularName %>Service<% if (anyFieldIsDateDerived) { %>, Rest<%= entityAngularName %><% } %> } from './<%= entityFileName %>.service';
-
-const requireRestSample: <% if (anyFieldIsDateDerived) { %>Rest<% } else { %>I<% } %><%= entityAngularName %> = {
-  ...sampleWithRequiredData,
-<%_ fields.forEach((field) => { _%>
-<%_  if (field.fieldTypeLocalDate) { _%>
-  <%= field.fieldName %>: sampleWithRequiredData.<%= field.fieldName %>?.format(DATE_FORMAT),
-<%_ } else if (field.fieldTypeTimed) { _%>
-  <%= field.fieldName %>: sampleWithRequiredData.<%= field.fieldName %>?.toJSON(),
-<%_ } _%>
-<%_ }) _%>
-};
-
-describe('<%= entityAngularName %> Service', () => {
-    let service: <%= entityAngularName %>Service;
-    let httpMock: HttpTestingController;
-    let expectedResult: I<%= entityAngularName %> | I<%= entityAngularName %>[] | boolean | null;
-
-    beforeEach(() => {
-        TestBed.configureTestingModule({
-            imports: [
-                HttpClientTestingModule
-            ]
-        });
-        expectedResult = null;
-        service = TestBed.inject(<%= entityAngularName %>Service);
-        httpMock = TestBed.inject(HttpTestingController);
-    });
-
-    describe('Service methods', () => {
-        it('should find an element', () => {
-            const returnedFromService = { ...requireRestSample };
-            const expected = { ...sampleWithRequiredData };
-
-            service.find(<%- tsKeyId %>).subscribe(resp => expectedResult = resp.body);
-
-            const req = httpMock.expectOne({ method: 'GET' });
-            req.flush(returnedFromService);
-            expect(expectedResult).toMatchObject(expected);
-        });
-
-<%_ if (!readOnly) { _%>
-        it('should create a <%= entityAngularName %>', () => {
-            const <%= entityInstance %> = { ...sampleWithNewData };
-            const returnedFromService = { ...requireRestSample };
-            const expected = { ...sampleWithRequiredData };
-
-            service.create(<%= entityInstance %>).subscribe(resp => expectedResult = resp.body);
-
-            const req = httpMock.expectOne({ method: 'POST' });
-            req.flush(returnedFromService);
-            expect(expectedResult).toMatchObject(expected);
-        });
-
-        it('should update a <%= entityAngularName %>', () => {
-            const <%= entityInstance %> = { ...sampleWithRequiredData };
-            const returnedFromService = { ...requireRestSample };
-            const expected = { ...sampleWithRequiredData };
-
-            service.update(<%= entityInstance %>).subscribe(resp => expectedResult = resp.body);
-
-            const req = httpMock.expectOne({ method: 'PUT' });
-            req.flush(returnedFromService);
-            expect(expectedResult).toMatchObject(expected);
-        });
-
-        it('should partial update a <%= entityAngularName %>', () => {
-            const patchObject = { ...sampleWithPartialData };
-            const returnedFromService = { ...requireRestSample };
-            const expected = { ...sampleWithRequiredData }
-
-            service.partialUpdate(patchObject).subscribe(resp => expectedResult = resp.body);
-
-            const req = httpMock.expectOne({ method: 'PATCH' });
-            req.flush(returnedFromService);
-            expect(expectedResult).toMatchObject(expected);
-        });
-<%_ } _%>
-
-        it('should return a list of <%= entityAngularName %>', () => {
-            const returnedFromService = { ...requireRestSample };
-
-            const expected = { ...sampleWithRequiredData };
-
-            service.query().subscribe(resp => expectedResult = resp.body);
-
-            const req = httpMock.expectOne({ method: 'GET' });
-            req.flush([returnedFromService]);
-            httpMock.verify();
-            expect(expectedResult).toMatchObject([expected]);
-        });
-
-<%_ if (!readOnly) { _%>
-        it('should delete a <%= entityAngularName %>', () => {
-            const expected = true;
-
-            service.delete(<%- tsKeyId %>).subscribe(resp => expectedResult = resp.ok);
-
-            const req = httpMock.expectOne({ method: 'DELETE' });
-            req.flush({ status: 200 });
-            expect(expectedResult).toBe(expected);
-        });
-<%_ } _%>
-
-<%_ if (searchEngineAny) { _%>
-        it('should handle exceptions for searching a <%= entityAngularName %>', () => {
-            const queryObject: any = {
-                page: 0,
-                size: 20,
-                query: '',
-                sort: [],
-            };
-            service.search(queryObject).subscribe(() => expectedResult);
-
-            const req = httpMock.expectOne({ method: 'GET' });
-            req.flush(null, { status: 500, statusText: 'Internal Server Error' });
-            expect(expectedResult).toBe(null);
-        });
-<%_ } _%>
-
-        describe('add<%= entityAngularName %>ToCollectionIfMissing', () => {
-            it('should add a <%= entityAngularName %> to an empty array', () => {
-                const <%= entityInstance %>: I<%= entityAngularName %> = sampleWithRequiredData;
-                expectedResult = service.add<%= entityAngularName %>ToCollectionIfMissing([], <%= entityInstance %>);
-                expect(expectedResult).toHaveLength(1);
-                expect(expectedResult).toContain(<%= entityInstance %>);
-            });
-
-            it('should not add a <%= entityAngularName %> to an array that contains it', () => {
-                const <%= entityInstance %>: I<%= entityAngularName %> = sampleWithRequiredData;
-                const <%= entityInstance %>Collection: I<%= entityAngularName %>[] = [{
-                    ...<%= entityInstance %>,
-                }, sampleWithPartialData];
-                expectedResult = service.add<%= entityAngularName %>ToCollectionIfMissing(<%= entityInstance %>Collection, <%= entityInstance %>);
-                expect(expectedResult).toHaveLength(2);
-            });
-
-            it("should add a <%= entityAngularName %> to an array that doesn't contain it", () => {
-                const <%= entityInstance %>: I<%= entityAngularName %> = sampleWithRequiredData;
-                const <%= entityInstance %>Collection: I<%= entityAngularName %>[] = [sampleWithPartialData];
-                expectedResult = service.add<%= entityAngularName %>ToCollectionIfMissing(<%= entityInstance %>Collection, <%= entityInstance %>);
-                expect(expectedResult).toHaveLength(2);
-                expect(expectedResult).toContain(<%= entityInstance %>);
-            });
-
-            it('should add only unique <%= entityAngularName %> to an array', () => {
-                const <%= entityInstance %>Array: I<%= entityAngularName %>[] = [sampleWithRequiredData, sampleWithPartialData, sampleWithFullData];
-                const <%= entityInstance %>Collection: I<%= entityAngularName %>[] = [sampleWithRequiredData];
-                expectedResult = service.add<%= entityAngularName %>ToCollectionIfMissing(<%= entityInstance %>Collection, ...<%= entityInstance %>Array);
-                expect(expectedResult).toHaveLength(3);
-            });
-
-            it('should accept varargs', () => {
-                const <%= entityInstance %>: I<%= entityAngularName %> = sampleWithRequiredData;
-                const <%= entityInstance %>2: I<%= entityAngularName %> = sampleWithPartialData;
-                expectedResult = service.add<%= entityAngularName %>ToCollectionIfMissing([], <%= entityInstance %>, <%= entityInstance %>2);
-                expect(expectedResult).toHaveLength(2);
-                expect(expectedResult).toContain(<%= entityInstance %>);
-                expect(expectedResult).toContain(<%= entityInstance %>2);
-            });
-
-            it('should accept null and undefined values', () => {
-                const <%= entityInstance %>: I<%= entityAngularName %> = sampleWithRequiredData;
-                expectedResult = service.add<%= entityAngularName %>ToCollectionIfMissing([], null, <%= entityInstance %>, undefined);
-                expect(expectedResult).toHaveLength(1);
-                expect(expectedResult).toContain(<%= entityInstance %>);
-            });
-
-            it('should return initial array if no <%= entityAngularName %> is added', () => {
-                const <%= entityInstance %>Collection: I<%= entityAngularName %>[] = [sampleWithRequiredData];
-                expectedResult = service.add<%= entityAngularName %>ToCollectionIfMissing(<%= entityInstance %>Collection, undefined, null);
-                expect(expectedResult).toEqual(<%= entityInstance %>Collection);
-            });
-        });
-
-        describe('compare<%= entityAngularName %>', () => {
-            it('Should return true if both entities are null', () => {
-                const entity1 = null;
-                const entity2 = null;
-
-                const compareResult = service.compare<%= entityAngularName %>(entity1, entity2);
-
-                expect(compareResult).toEqual(true);
-            });
-
-            it('Should return false if one entity is null', () => {
-                const entity1 = <%- this.generateTestEntityPrimaryKey(primaryKey, 0) %>;
-                const entity2 = null;
-
-                const compareResult1 = service.compare<%= entityAngularName %>(entity1, entity2);
-                const compareResult2 = service.compare<%= entityAngularName %>(entity2, entity1);
-
-                expect(compareResult1).toEqual(false);
-                expect(compareResult2).toEqual(false);
-            });
-
-            it('Should return false if primaryKey differs', () => {
-                const entity1 = <%- this.generateTestEntityPrimaryKey(primaryKey, 0) %>;
-                const entity2 = <%- this.generateTestEntityPrimaryKey(primaryKey, 1) %>;
-
-                const compareResult1 = service.compare<%= entityAngularName %>(entity1, entity2);
-                const compareResult2 = service.compare<%= entityAngularName %>(entity2, entity1);
-
-                expect(compareResult1).toEqual(false);
-                expect(compareResult2).toEqual(false);
-            });
-
-            it('Should return false if primaryKey matches', () => {
-                const entity1 = <%- this.generateTestEntityPrimaryKey(primaryKey, 0) %>;
-                const entity2 = <%- this.generateTestEntityPrimaryKey(primaryKey, 0) %>;
-
-                const compareResult1 = service.compare<%= entityAngularName %>(entity1, entity2);
-                const compareResult2 = service.compare<%= entityAngularName %>(entity2, entity1);
-
-                expect(compareResult1).toEqual(true);
-                expect(compareResult2).toEqual(true);
-            });
-        });
-    });
-
-    afterEach(() => {
-        httpMock.verify();
-    });
-});

package/dist/generators/angular/templates/src/main/webapp/app/entities/_entityFolder/service/_entityFile.service.ts.ejs

@@ -1,203 +0,0 @@
-<%#
- Copyright 2013-2023 the original author or authors from the JHipster project.
-
- This file is part of the JHipster project, see https://www.jhipster.tech/
- for more information.
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-      https://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--%>
-<%_
-let searchType = 'Search';
-if (paginationPagination || paginationInfiniteScroll) {
-    searchType = 'SearchWithPagination';
-}
-_%>
-import { Injectable } from '@angular/core';
-import { HttpClient, HttpResponse } from '@angular/common/http';
-import { Observable<%_ if (searchEngineAny) { _%>, asapScheduler, scheduled<%_ } _%> } from 'rxjs';
-
-<%_ if (searchEngineAny) {
-  if (anyFieldIsDateDerived) { _%>
-import { catchError, map } from 'rxjs/operators';
-<% } else { %>
-import { catchError } from 'rxjs/operators';
-<%_ }
-   } else if (anyFieldIsDateDerived) { _%>
-import { map } from 'rxjs/operators';
-<%_ } _%>
-
-<%_ if (anyFieldIsDateDerived) { _%>
-import dayjs from 'dayjs/esm';
-<%_ } _%>
-
-import { isPresent } from 'app/core/util/operators';
-<%_ if (anyFieldIsLocalDate) { _%>
-import { DATE_FORMAT } from 'app/config/input.constants';
-<%_ } _%>
-import { ApplicationConfigService } from 'app/core/config/application-config.service';
-import { createRequestOption } from 'app/core/request/request-util';
-<%_ if (searchEngineAny) { _%>
-import { <%= searchType %> } from 'app/core/request/request.model';
-<%_ } _%>
-import { I<%= entityAngularName %>, New<%= entityAngularName %> } from '../<%= entityFileName %>.model';
-
-export type PartialUpdate<%= entityAngularName %> = Partial<I<%= entityAngularName %>> & Pick<I<%= entityAngularName %>, '<%= primaryKey.name %>'>;
-
-<%_ const entityRestName = anyFieldIsDateDerived ? `Rest${entityAngularName}` : `I${entityAngularName}`; _%>
-<%_ if (anyFieldIsDateDerived) { _%>
-type RestOf<T extends I<%= entityAngularName %> | New<%= entityAngularName %>> =
-  Omit<T, '<%- fields.filter(field => field.fieldTypeTemporal).map(field => field.fieldName).join("' | '") %>'> &
-  {
-  <%_ for (const field of fields.filter(field => field.fieldTypeTemporal)) { _%>
-  <%= field.fieldName %>?: string | null;
-  <%_ } _%>
-  };
-
-export type <%= entityRestName %> = RestOf<I<%= entityAngularName %>>;
-
-export type New<%= entityRestName %> = RestOf<New<%= entityAngularName %>>;
-
-export type PartialUpdate<%= entityRestName %> = RestOf<PartialUpdate<%= entityAngularName %>>;
-
-<%_ } _%>
-export type EntityResponseType = HttpResponse<I<%= entityAngularName %>>;
-export type EntityArrayResponseType = HttpResponse<I<%= entityAngularName %>[]>;
-
-@Injectable({ providedIn: 'root' })
-export class <%= entityAngularName %>Service {
-    protected resourceUrl = this.applicationConfigService.getEndpointFor('api/<%= entityApiUrl %>'<% if ((applicationTypeGateway || applicationTypeMicroservice) && locals.microserviceName) { %>, '<%= microserviceName.toLowerCase() %>'<% } %>);
-<%_ if (searchEngineAny) { _%>
-    protected resourceSearchUrl = this.applicationConfigService.getEndpointFor('api/_search/<%= entityApiUrl %>'<% if ((applicationTypeGateway || applicationTypeMicroservice) && locals.microserviceName) { %>, '<%= microserviceName.toLowerCase() %>'<% } %>);
-<%_ } _%>
-
-    constructor(protected http: HttpClient, protected applicationConfigService: ApplicationConfigService) {}
-
-<%_ if (!readOnly) { _%>
-    create(<%= entityInstance %>: New<%= entityAngularName %>): Observable<EntityResponseType> {
-    <%_ if (anyFieldIsDateDerived) { _%>
-        const copy = this.convertDateFromClient(<%= entityInstance %>);
-    <%_ } _%>
-        return this.http.post<<%= entityRestName %>>(this.resourceUrl,
-                <% if (anyFieldIsDateDerived) { %> copy <% } else { %> <%= entityInstance %> <% } %>,
-                { observe: 'response' })
-        <% if (anyFieldIsDateDerived) { %>.pipe(map(res => this.convertResponseFromServer(res)))<% } %>;
-    }
-
-    update(<%= entityInstance %>: I<%= entityAngularName %>): Observable<EntityResponseType> {
-    <%_ if (anyFieldIsDateDerived) { _%>
-        const copy = this.convertDateFromClient(<%= entityInstance %>);
-    <%_ } _%>
-        return this.http.put<<%= entityRestName %>>(`${this.resourceUrl}/${this.get<%= entityAngularName %>Identifier(<%= entityInstance %>)}`,
-                <% if (anyFieldIsDateDerived) { %> copy <% } else { %> <%= entityInstance %> <% } %>,
-                { observe: 'response' })
-        <% if (anyFieldIsDateDerived) { %>.pipe(map(res => this.convertResponseFromServer(res)))<% } %>;
-    }
-
-    partialUpdate(<%= entityInstance %>: PartialUpdate<%= entityAngularName %>): Observable<EntityResponseType> {
-    <%_ if (anyFieldIsDateDerived) { _%>
-        const copy = this.convertDateFromClient(<%= entityInstance %>);
-    <%_ } _%>
-        return this.http.patch<<%= entityRestName %>>(`${this.resourceUrl}/${this.get<%= entityAngularName %>Identifier(<%= entityInstance %>)}`,
-                <% if (anyFieldIsDateDerived) { %> copy <% } else { %> <%= entityInstance %> <% } %>,
-                { observe: 'response' })
-        <% if (anyFieldIsDateDerived) { %>.pipe(map(res => this.convertResponseFromServer(res)))<% } %>;
-    }
-<%_ } _%>
-
-    find(id: <%= tsKeyType %>): Observable<EntityResponseType> {
-        return this.http.get<<%= entityRestName %>>(`${this.resourceUrl}/${id}`, { observe: 'response' })
-            <% if (anyFieldIsDateDerived) { %>.pipe(map(res => this.convertResponseFromServer(res)))<% } %>;
-    }
-
-    query(req?: any): Observable<EntityArrayResponseType> {
-        const options = createRequestOption(req);
-        return this.http.get<<%= entityRestName %>[]>(this.resourceUrl, { params: options, observe: 'response' })
-            <% if (anyFieldIsDateDerived) { %>.pipe(map(res => this.convertResponseArrayFromServer(res)))<% } %>;
-    }
-
-<%_ if (!readOnly) { _%>
-    delete(id: <%= tsKeyType %>): Observable<HttpResponse<{}>> {
-        return this.http.delete(`${this.resourceUrl}/${id}`, { observe: 'response' });
-    }
-<%_ } _%>
-
-<%_ if (searchEngineAny) { _%>
-    search(req: <%= searchType %>): Observable<EntityArrayResponseType> {
-        const options = createRequestOption(req);
-        return this.http.get<<%= entityRestName %>[]>(this.resourceSearchUrl, { params: options, observe: 'response' })
-            .pipe(<% if (anyFieldIsDateDerived) { %>map(res => this.convertResponseArrayFromServer(res)), <% } %>catchError(() => scheduled([new HttpResponse<I<%= entityAngularName %>[]>()], asapScheduler)));
-    }
-<%_ } _%>
-
-    get<%= entityAngularName %>Identifier(<%= entityInstance %>: Pick<I<%= entityAngularName %>, '<%= primaryKey.name %>'>): <%= primaryKey.tsType %> {
-        return <%= entityInstance %>.<%= primaryKey.name %>;
-    }
-
-    compare<%= entityAngularName %>(o1: Pick<I<%= entityAngularName %>, '<%= primaryKey.name %>'> | null, o2: Pick<I<%= entityAngularName %>, '<%= primaryKey.name %>'> | null): boolean {
-        return o1 && o2 ? this.get<%= entityAngularName %>Identifier(o1) === this.get<%= entityAngularName %>Identifier(o2) : o1 === o2;
-    }
-
-    add<%= entityAngularName %>ToCollectionIfMissing<Type extends Pick<I<%= entityAngularName %>, '<%= primaryKey.name %>'>>(<%= entityInstance %>Collection: Type[], ...<%= entityInstancePlural %>ToCheck: (Type | null | undefined)[]): Type[] {
-        const <%= entityInstancePlural %>: Type[] = <%= entityInstancePlural %>ToCheck.filter(isPresent);
-        if (<%= entityInstancePlural %>.length > 0) {
-            const <%= entityInstance %>CollectionIdentifiers = <%= entityInstance %>Collection.map(<%= entityInstance %>Item => this.get<%= entityAngularName %>Identifier(<%= entityInstance %>Item)!);
-            const <%= entityInstancePlural %>ToAdd = <%= entityInstancePlural %>.filter(<%= entityInstance %>Item => {
-                const <%= entityInstance %>Identifier = this.get<%= entityAngularName %>Identifier(<%= entityInstance %>Item);
-                if (<%= entityInstance %>CollectionIdentifiers.includes(<%= entityInstance %>Identifier)) {
-                    return false;
-                }
-                <%= entityInstance %>CollectionIdentifiers.push(<%= entityInstance %>Identifier);
-                return true;
-            });
-            return [...<%= entityInstancePlural %>ToAdd, ...<%= entityInstance %>Collection];
-        }
-        return <%= entityInstance %>Collection;
-    }
-
-<%_ if (anyFieldIsDateDerived) { _%>
-    protected convertDateFromClient<T extends I<%= entityAngularName %> | New<%= entityAngularName %> | PartialUpdate<%= entityAngularName %>>(<%= entityInstance %>: T): RestOf<T> {
-        return {
-            ...<%= entityInstance %>,
-    <%_ for (const field of fields) { _%>
-        <%_ if (field.fieldTypeTimed) { _%>
-        <%= field.fieldName %>: <%= entityInstance %>.<%= field.fieldName %>?.toJSON() ?? null,
-        <%_ } _%>
-        <%_ if (field.fieldTypeLocalDate) { _%>
-        <%= field.fieldName %>: <%= entityInstance %>.<%= field.fieldName %>?.format(DATE_FORMAT) ?? null,
-        <%_ } _%>
-    <%_ } _%>
-        };
-    }
-
-    protected convertDateFromServer(rest<%= entityAngularName %>: <%= entityRestName %>): I<%= entityAngularName %> {
-        return {
-            ...rest<%= entityAngularName %>,
-    <%_ for (const field of fields.filter(field => field.fieldTypeTemporal)) { _%>
-            <%= field.fieldName %>: rest<%= entityAngularName %>.<%= field.fieldName %> ? dayjs(rest<%= entityAngularName %>.<%= field.fieldName %>) : undefined,
-    <%_ } _%>
-        }
-    }
-
-  protected convertResponseFromServer(res: HttpResponse<<%= entityRestName %>>): HttpResponse<I<%= entityAngularName %>> {
-    return res.clone({
-      body: res.body ? this.convertDateFromServer(res.body) : null,
-    });
-  }
-
-  protected convertResponseArrayFromServer(res: HttpResponse<<%= entityRestName %>[]>): HttpResponse<I<%= entityAngularName %>[]> {
-    return res.clone({
-      body: res.body ? res.body.map(item => this.convertDateFromServer(item)) : null,
-    });
-  }
-<%_ } _%>
-}