Skip to content

Commit

Permalink
Merge pull request #200 from swisstopo/feature/asset-192-bug-performa…
Browse files Browse the repository at this point in the history 
…nce-suche

Feature 192: Bug - Performance Suche
  • Loading branch information
@daniel-va
daniel-va authored Jul 8, 2024
2 parents c8a8458 + 5bfbc69 commit 3d38905
Show file tree
Hide file tree
Showing 25 changed files with 476 additions and 385 deletions.
1 change: 1 addition & 0 deletions .prettierignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,4 @@
/dist
/node_modules
/tmp
/.idea
4 changes: 4 additions & 0 deletions apps/server-asset-sg/src/app.module.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ import { ContactsController } from '@/features/contacts/contacts.controller';
import { FavoriteRepo } from '@/features/favorites/favorite.repo';
import { FavoritesController } from '@/features/favorites/favorites.controller';
import { OcrController } from '@/features/ocr/ocr.controller';
import { StudiesController } from '@/features/studies/studies.controller';
import { StudyRepo } from '@/features/studies/study.repo';
import { UserRepo } from '@/features/users/user.repo';
import { UsersController } from '@/features/users/users.controller';

Expand All @@ -36,6 +38,7 @@ import { UsersController } from '@/features/users/users.controller';
AssetSearchController,
AssetsController,
AssetController,
StudiesController,
ContactsController,
OcrController,
],
Expand All @@ -50,6 +53,7 @@ import { UsersController } from '@/features/users/users.controller';
ContactRepo,
FavoriteRepo,
UserRepo,
StudyRepo,
AssetEditService,
AssetSearchService,
{
Expand Down
5 changes: 0 additions & 5 deletions apps/server-asset-sg/src/features/asset-old/asset.controller.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,11 +67,6 @@ export class AssetController {
return e.right;
}

@Get('/all-study')
getAllStudies() {
return this.assetService.getAllStudies();
}

@Get('/reference-data')
async getReferenceData() {
const e = await this.assetService.getReferenceData()();
Expand Down
239 changes: 3 additions & 236 deletions apps/server-asset-sg/src/features/asset-old/asset.service.ts
View file
Original file line number Diff line number Diff line change
@@ -1,23 +1,11 @@
import { DT, decodeError, isNotNil, unknownToError, unknownToUnknownError } from '@asset-sg/core';
import {
AssetSearchParams,
BaseAssetDetail,
DateId,
DateIdFromDate,
SearchAssetResult,
UsageCode,
makeUsageCode,
} from '@asset-sg/shared';
import { decodeError, isNotNil, unknownToError, unknownToUnknownError } from '@asset-sg/core';
import { AssetSearchParams, BaseAssetDetail, SearchAssetResult } from '@asset-sg/shared';
import { Injectable } from '@nestjs/common';
import { sequenceS } from 'fp-ts/Apply';
import * as A from 'fp-ts/Array';
import { contramap } from 'fp-ts/Eq';
import { Lazy, flow, pipe } from 'fp-ts/function';
import * as NEA from 'fp-ts/NonEmptyArray';
import * as N from 'fp-ts/number';
import { flow, Lazy, pipe } from 'fp-ts/function';
import * as O from 'fp-ts/Option';
import * as RR from 'fp-ts/ReadonlyRecord';
import * as S from 'fp-ts/string';
import * as TE from 'fp-ts/TaskEither';
import * as C from 'io-ts/Codec';
import * as D from 'io-ts/Decoder';
Expand All @@ -34,39 +22,6 @@ import { postgresStudiesByAssetId } from '@/utils/postgres-studies/postgres-stud
export class AssetService {
constructor(private readonly prismaService: PrismaService, private readonly assetSearchService: AssetSearchService) {}

async getData(polygon: [number, number][]) {
const polygonParam = polygon.map((point) => `${point[0]} ${point[1]}`).join(',');

const result = await this.prismaService.$queryRawUnsafe(
`select id, accident_uid, year, month, canton, ST_AsText(geom) as geom from bicycle_accidents where ST_INTERSECTS(geom, ST_GeomFromText('POLYGON((${polygonParam}))', 2056))`
);
return { result };
}

async getAllStudies() {
interface RawStudy {
studyId: string;
assetId: number;
isPoint: boolean;
centroidGeomText: string;
}
const rawData: RawStudy[] = await this.prismaService.$queryRawUnsafe(`
SELECT
study_id AS "studyId",
asset_id AS "assetId",
is_point AS "isPoint",
centroid_geom_text AS "centroidGeomText"
FROM public.all_study
`);

return rawData.map((study) => ({
studyId: study.studyId,
assetId: study.assetId,
isPoint: study.isPoint,
centroid: study.centroidGeomText.replace('POINT(', '').replace(')', ''),
}));
}

getFile(fileId: number) {
return getFile(this.prismaService, fileId);
}
Expand Down Expand Up @@ -110,114 +65,6 @@ export class AssetService {
);
}

// findAssetsByPolygon(polygon: [number, number][]) {
// return findAssetsByPolygon(this.prismaService, polygon);
// }

// findAssetsByPolygon(polygon: [number, number][]) {
// const polygonParam = polygon.map(point => `${point[0]} ${point[1]}`).join(',');

// return pipe(
// TE.tryCatch(
// () =>
// this.prismaService.$queryRawUnsafe(`
// select
// a.asset_id as "assetId",
// a.title_public as "titlePublic",
// a.create_date as "createDateId",
// a.asset_kind_item_code as "assetKindItemCode",
// a.asset_format_item_code as "assetFormatItemCode",
// mclr.man_cat_label_item_code as "manCatLabelItemCode",
// ac.contact_id as "contactId",
// ac.role as "contactRole",
// s.study_id as "studyId",
// s.geom_text as "studyGeomText"
// from all_study s
// inner join asset a
// on s.asset_id = a.asset_id
// left join
// asset_contact ac
// on ac.asset_id = a.asset_id
// left join
// man_cat_label_ref mclr
// on ac.asset_id = mclr.asset_id
// where
// st_intersects(geom, st_geomfromtext('polygon((${polygonParam}))', 2056))
// order by
// a.asset_id
// `),
// unknownToError,
// ),
// TE.chainW(
// flow(
// DBResultList.decode,
// E.mapLeft(e => new Error(D.draw(e))),
// TE.fromEither,
// ),
// ),
// TE.map(
// flow(
// NEA.fromArray,
// O.map(assets => {
// const orderedDates: NEA.NonEmptyArray<DateId> = pipe(
// assets,
// NEA.map(a => a.createDate),
// NEA.uniq(DateIdOrd),
// NEA.sort(DateIdOrd),
// );
// return SearchAssetResult.encode({
// _tag: 'SearchAssetResultNonEmpty',
// aggregations: {
// ranges: { createDate: { min: NEA.head(orderedDates), max: NEA.last(orderedDates) } },
// buckets: {
// authorIds: pipe(
// assets,
// A.map(a => a.contacts.filter(c => c.role === 'author').map(c => c.id)),
// A.flatten,
// NEA.fromArray,
// O.map(
// flow(
// NEA.groupBy(a => String(a)),
// R.map(g => ({ key: NEA.head(g), count: g.length })),
// R.toArray,
// A.map(([, value]) => value),
// ),
// ),
// O.getOrElseW(() => []),
// ),
// },
// },
// assets: assets.map(asset => ({ ...asset, score: 1 })),
// });
// }),
// O.getOrElse(() => SearchAssetResult.encode({ _tag: 'SearchAssetResultEmpty' })),
// ),
// ),
// );
// }

// async findStudiesByPolygon(polygon: [number, number][]) {
// const polygonParam = polygon.map(point => `${point[0]} ${point[1]}`).join(',');

// console.log(
// `select study_id as "studyId", geom_text as "geomText", asset_id as "assetId" from public.all_study where st_intersects(geom, st_geomfromtext('polygon((${polygonParam}))', 2056))`,
// );

// return await this.prismaService.$queryRawUnsafe(
// `select study_id as "studyId", geom_text as "geomText", asset_id as "assetId"
// from public.all_study
// where st_intersects(geom, st_geomfromtext('polygon((${polygonParam}))', 2056))`,
// );
// }

// async findStudiesByAssetId(assetId: number) {
// return await this.prismaService.$queryRawUnsafe(
// `select study_id as "studyId", geom_text as "geomText", asset_id as "assetId"
// from public.all_study
// where asset_id=${assetId}}`,
// );
// }

getReferenceData() {
const qt = <A, K extends keyof A>(f: Lazy<Promise<A[]>>, key: K, newKey: string) =>
pipe(
Expand Down Expand Up @@ -307,83 +154,3 @@ export class AssetService {
);
}
}

const DBResultRaw = D.struct({
assetId: D.number,
titlePublic: D.string,
contactId: DT.optionFromNullable(D.number),
contactRole: DT.optionFromNullable(D.string),
createDate: DateIdFromDate,
assetKindItemCode: D.string,
assetFormatItemCode: D.string,
languageItemCode: D.string,
manCatLabelItemCode: DT.optionFromNullable(D.string),
internalUse: D.boolean,
publicUse: D.boolean,
studyId: DT.optionFromNullable(D.string),
studyGeomText: DT.optionFromNullable(D.string),
});
type DBResultRaw = D.TypeOf<typeof DBResultRaw>;

// eslint-disable-next-line @typescript-eslint/no-unused-vars
const DBResultRawList = D.array(DBResultRaw);

type DBResultRawList = D.TypeOf<typeof DBResultRawList>;

type DBResult = {
assetId: number;
titlePublic: string;
createDate: DateId;
assetKindItemCode: string;
assetFormatItemCode: string;
languageItemCode: string;
manCatLabelItemCodes: Array<string>;
usageCode: UsageCode;
contacts: Array<{ role: string; id: number }>;
studies: Array<{ studyId: string; geomText: string }>;
};

const eqStudyByStudyId = contramap((x: { studyId: string; geomText: string }) => x.studyId)(S.Eq);
const eqContactByContactId = contramap((x: { contactId: number; contactRole: string }) => x.contactId)(N.Eq);

// eslint-disable-next-line @typescript-eslint/no-unused-vars
const dbResultRawToDBResult = (dbResultRawList: NEA.NonEmptyArray<DBResultRaw>): DBResult => {
const {
assetId,
titlePublic,
createDate,
assetFormatItemCode,
assetKindItemCode,
languageItemCode,
internalUse,
publicUse,
} = NEA.head(dbResultRawList);
return {
assetId,
titlePublic,
createDate,
assetFormatItemCode,
assetKindItemCode,
languageItemCode,
contacts: pipe(
dbResultRawList,
NEA.map((x) => sequenceS(O.Apply)({ contactId: x.contactId, contactRole: x.contactRole })),
A.compact,
A.uniq(eqContactByContactId),
A.map((a) => ({ id: a.contactId, role: a.contactRole }))
),
studies: pipe(
dbResultRawList,
NEA.map((x) => sequenceS(O.Apply)({ studyId: x.studyId, geomText: x.studyGeomText })),
A.compact,
A.uniq(eqStudyByStudyId)
),
manCatLabelItemCodes: pipe(
dbResultRawList,
NEA.map((x) => x.manCatLabelItemCode),
A.compact,
A.uniq(S.Eq)
),
usageCode: makeUsageCode(publicUse, internalUse),
};
};
17 changes: 6 additions & 11 deletions apps/server-asset-sg/src/features/assets/asset.model.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import { Transform, Type } from 'class-transformer';
import { IsArray, IsBoolean, IsDate, IsEnum, IsInt, IsObject, IsString, ValidateNested } from 'class-validator';

import { IsNullable, messageNullableInt, messageNullableString } from '@/core/decorators/is-nullable.decorator';
import { StudyType } from '@/features/studies/study.model';
import { LocalDate } from '@/utils/data/local-date';
import { Data, Model } from '@/utils/data/model';

Expand Down Expand Up @@ -54,7 +55,7 @@ export interface AssetDetails {
infoGeol: InfoGeol;
usage: AssetUsages;
statuses: WorkStatus[];
studies: Study[];
studies: AssetStudy[];
}

export interface AssetUsages {
Expand All @@ -70,7 +71,7 @@ export interface AssetData extends Omit<Data<Asset>, NonDataKeys> {
links: AssetLinksData;
identifiers: (AssetIdentifier | AssetIdentifierData)[];
statuses: (WorkStatus | WorkStatusData)[];
studies: (Study | StudyData)[];
studies: (AssetStudy | StudyData)[];
}

interface InfoGeol {
Expand Down Expand Up @@ -137,20 +138,14 @@ export enum UsageCode {
UseOnRequest = 'useOnRequest',
}

export interface Study extends Model<StudyId> {
export interface AssetStudy extends Model<AssetStudyId> {
geom: string;
type: StudyType;
}

export type StudyData = Data<Study>;
export type StudyData = Data<AssetStudy>;

export type StudyId = number;

export enum StudyType {
Area = 'area',
Location = 'location',
Trace = 'trace',
}
export type AssetStudyId = number;

export class AssetUsageBoundary implements AssetUsage {
@IsBoolean()
Expand Down
Loading

0 comments on commit 3d38905

Please sign in to comment.