[RND-623] initial matchup to MetaEd api-schema plugin

Ed-Fi-Exchange-OSS · Sep 25, 2023 · 607eb6a · 607eb6a
1 parent 4b452e4
commit 607eb6a
Show file tree

Hide file tree

Showing 89 changed files with 148,121 additions and 1,753 deletions.
diff --git a/...-js/backends/meadowlark-elasticsearch-backend/test/integration/QueryElasticsearch.test.ts b/...-js/backends/meadowlark-elasticsearch-backend/test/integration/QueryElasticsearch.test.ts
@@ -14,9 +14,11 @@ import {
   AuthorizationStrategy,
   DeleteRequest,
   DeleteResult,
+  generateDocumentUuid,
+  DocumentUuid,
+  MeadowlarkId,
+  TraceId,
 } from '@edfi/meadowlark-core';
-import { DocumentUuid, MeadowlarkId, TraceId } from '@edfi/meadowlark-core/src/model/IdTypes';
-import { generateDocumentUuid } from '@edfi/meadowlark-core/src/model/DocumentIdentity';
 import { Client } from '@elastic/elasticsearch';
 import { queryDocuments } from '../../src/repository/QueryElasticsearch';
 import { afterDeleteDocumentById, afterUpsertDocument } from '../../src/repository/UpdateElasticsearch';

diff --git a/Meadowlark-js/backends/meadowlark-mongodb-backend/src/model/MeadowlarkDocument.ts b/Meadowlark-js/backends/meadowlark-mongodb-backend/src/model/MeadowlarkDocument.ts
@@ -96,12 +96,12 @@ export interface MeadowlarkDocument extends MeadowlarkDocumentId {
   createdBy: string;
 
   /*
-   * Creation date as as Unix timestamp, or null if this is a document to be updated and we don't know the create time yet
+   * Creation date as a Unix timestamp, or null if this is a document to be updated and we don't know the create time yet
    */
   createdAt: number | null;
 
   /*
-   * Last modified date as as Unix timestamp.
+   * Last modified date as a Unix timestamp.
    */
   lastModifiedAt: number;
 

diff --git a/Meadowlark-js/backends/meadowlark-mongodb-backend/test/integration/OwnershipSecurity.test.ts b/Meadowlark-js/backends/meadowlark-mongodb-backend/test/integration/OwnershipSecurity.test.ts
@@ -17,9 +17,9 @@ import {
   UpsertRequest,
   TraceId,
   UpsertResult,
+  newFrontendRequestMiddleware,
+  newPathComponents,
 } from '@edfi/meadowlark-core';
-import { newFrontendRequestMiddleware } from '@edfi/meadowlark-core/src/handler/FrontendRequest';
-import { newPathComponents } from '@edfi/meadowlark-core/src/model/PathComponents';
 import { MongoClient } from 'mongodb';
 import { getDocumentCollection, getNewClient } from '../../src/repository/Db';
 import { rejectByOwnershipSecurity } from '../../src/repository/OwnershipSecurity';

diff --git a/...owlark-js/backends/meadowlark-mongodb-backend/test/integration/SecurityMiddleware.test.ts b/...owlark-js/backends/meadowlark-mongodb-backend/test/integration/SecurityMiddleware.test.ts
@@ -17,9 +17,9 @@ import {
   UpsertRequest,
   TraceId,
   UpsertResult,
+  newFrontendRequestMiddleware,
+  newPathComponents,
 } from '@edfi/meadowlark-core';
-import { newFrontendRequestMiddleware } from '@edfi/meadowlark-core/src/handler/FrontendRequest';
-import { newPathComponents } from '@edfi/meadowlark-core/src/model/PathComponents';
 import { MongoClient } from 'mongodb';
 import { getDocumentCollection, getNewClient } from '../../src/repository/Db';
 import { securityMiddleware } from '../../src/security/SecurityMiddleware';

diff --git a/Meadowlark-js/backends/meadowlark-mongodb-backend/test/middleware/SecurityMiddleware.test.ts b/Meadowlark-js/backends/meadowlark-mongodb-backend/test/middleware/SecurityMiddleware.test.ts
@@ -3,9 +3,14 @@
 // The Ed-Fi Alliance licenses this file to you under the Apache License, Version 2.0.
 // See the LICENSE and NOTICES files in the project root for more information.
 
-import { FrontendRequest, FrontendResponse, newFrontendRequest, newFrontendResponseSuccess } from '@edfi/meadowlark-core';
-import { newFrontendRequestMiddleware } from '@edfi/meadowlark-core/src/handler/FrontendRequest';
-import { newPathComponents } from '@edfi/meadowlark-core/src/model/PathComponents';
+import {
+  FrontendRequest,
+  FrontendResponse,
+  newFrontendRequest,
+  newFrontendResponseSuccess,
+  newFrontendRequestMiddleware,
+  newPathComponents,
+} from '@edfi/meadowlark-core';
 import { securityMiddleware } from '../../src/security/SecurityMiddleware';
 import * as OwnershipSecurity from '../../src/repository/OwnershipSecurity';
 

diff --git a/...owlark-js/backends/meadowlark-opensearch-backend/test/integration/QueryOpensearch.test.ts b/...owlark-js/backends/meadowlark-opensearch-backend/test/integration/QueryOpensearch.test.ts
@@ -14,9 +14,11 @@ import {
   AuthorizationStrategy,
   DeleteRequest,
   DeleteResult,
+  DocumentUuid,
+  MeadowlarkId,
+  TraceId,
+  generateDocumentUuid,
 } from '@edfi/meadowlark-core';
-import { DocumentUuid, MeadowlarkId, TraceId } from '@edfi/meadowlark-core/src/model/IdTypes';
-import { generateDocumentUuid } from '@edfi/meadowlark-core/src/model/DocumentIdentity';
 import { Client } from '@opensearch-project/opensearch/.';
 import { queryDocuments } from '../../src/repository/QueryOpensearch';
 import { afterDeleteDocumentById, afterUpsertDocument } from '../../src/repository/UpdateOpensearch';

diff --git a/...lark-js/backends/meadowlark-postgresql-backend/test/integration/OwnershipSecurity.test.ts b/...lark-js/backends/meadowlark-postgresql-backend/test/integration/OwnershipSecurity.test.ts
@@ -16,9 +16,9 @@ import {
   DocumentUuid,
   UpsertRequest,
   TraceId,
+  newFrontendRequestMiddleware,
+  newPathComponents
 } from '@edfi/meadowlark-core';
-import { newFrontendRequestMiddleware } from '@edfi/meadowlark-core/src/handler/FrontendRequest';
-import { newPathComponents } from '@edfi/meadowlark-core/src/model/PathComponents';
 import type { PoolClient } from 'pg';
 import { getSharedClient, resetSharedClient } from '../../src/repository/Db';
 import { deleteAll } from './TestHelper';

diff --git a/...ark-js/backends/meadowlark-postgresql-backend/test/integration/SecurityMiddleware.test.ts b/...ark-js/backends/meadowlark-postgresql-backend/test/integration/SecurityMiddleware.test.ts
@@ -17,9 +17,9 @@ import {
   DocumentUuid,
   UpsertRequest,
   TraceId,
+  newFrontendRequestMiddleware,
+  newPathComponents,
 } from '@edfi/meadowlark-core';
-import { newFrontendRequestMiddleware } from '@edfi/meadowlark-core/src/handler/FrontendRequest';
-import { newPathComponents } from '@edfi/meadowlark-core/src/model/PathComponents';
 import type { PoolClient } from 'pg';
 import { resetSharedClient, getSharedClient } from '../../src/repository/Db';
 import { securityMiddleware } from '../../src/security/SecurityMiddleware';