Merge pull request #323 from kellnerd/entity-import-bbid

Adapt to pending entities with BBIDs / Introducing Kysely

Author: MonkeyDo

.eslintrc.js

@@ -200,7 +200,6 @@ const stylisticIssuesRules = {
 			properties: 'always'
 		}
 	],
-	'comma-dangle': ERROR,
 	'comma-spacing': ERROR,
 	'comma-style': ERROR,
 	'computed-property-spacing': ERROR,

package.json

@@ -10,6 +10,7 @@
   "scripts": {
     "build": "rimraf lib/* && babel src --out-dir lib --extensions .js,.ts && tsc",
     "build-js-for-test": "rimraf lib/* && babel src --out-dir lib --source-maps inline --extensions .js,.ts",
+    "kysely-codegen": "kysely-codegen --out-file src/types/schema.ts --schema bookbrainz --camel-case",
     "lint": "eslint .",
     "lint-errors": "eslint --quiet .",
     "lint-staged": "lint-staged",
@@ -71,6 +72,7 @@
     "deep-diff": "^1.0.2",
     "immutable": "^3.8.2",
     "knex": "^2.4.2",
+    "kysely": "^0.27.4",
     "lodash": "^4.17.21",
     "moment": "^2.29.1",
     "pg": "^8.6.0",
@@ -99,6 +101,7 @@
     "glob": "^7.1.2",
     "husky": "^8.0.0",
     "jsinspect": "^0.12.7",
+    "kysely-codegen": "^0.17.0",
     "lint-staged": "^13.1.0",
     "mocha": "^10.2.0",
     "node-uuid": "^1.4.8",

src/func/create-entity.ts

@@ -2,7 +2,6 @@
  * Copied from bookbrainz-site
  * Copyright (C) 2016  Sean Burke
  *               2016  Ben Ockmore
- *               2018  Shivam Tripathi
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -19,33 +18,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-import {ORM} from '..';
-import type {Transaction} from './types';
-
-/**
- * Adds 1 to the edit count of the specified editor
- *
- * @param {ORM} orm - the BookBrainz ORM, initialized during app setup
- * @param {string} id - row ID of editor to be updated
- * @param {Transaction} transacting - Bookshelf transaction object (must be in
- * progress)
- * @returns {Promise} - Resolves to the updated editor model
- */
-export function incrementEditorEditCountById(
-	orm: ORM,
-	id: string,
-	transacting: Transaction
-): Promise<any> {
-	const {Editor} = orm;
-	return new Editor({id})
-		.fetch({transacting})
-		.then((editor) => {
-			// @ts-expect-error -- Types for custom methods of Bookshelf models are lacking
-			editor.incrementEditCount();
-			return editor.save(null, {transacting});
-		});
-}
-
 /* eslint-disable camelcase */
 function getEditorIDByMetaBrainzID(trx, metabrainzUserID) {
 	return trx('bookbrainz.editor')

src/func/editor.ts

@@ -79,59 +79,6 @@ export function getAdditionalEntityProps(
 	}
 }
 
-export type EntitySetMetadataT = {
-	entityIdField: string;
-	idField: string;
-	mutableFields?: string[];
-	name: string;
-	propName: string;
-};
-
-/**
- * @param  {string} entityType - Entity type string
- * @returns {Object} - Returns entitySetMetadata (derivedSets)
-*/
-export function getEntitySetMetadataByType(entityType: EntityTypeString): EntitySetMetadataT[] {
-	if (entityType === 'Edition') {
-		return [
-			{
-				entityIdField: 'languageSetId',
-				idField: 'id',
-				name: 'languageSet',
-				propName: 'languages'
-			},
-			{
-				entityIdField: 'publisherSetId',
-				idField: 'bbid',
-				name: 'publisherSet',
-				propName: 'publishers'
-			},
-			{
-				entityIdField: 'releaseEventSetId',
-				idField: 'id',
-				mutableFields: [
-					'date',
-					'areaId'
-				],
-				name: 'releaseEventSet',
-				propName: 'releaseEvents'
-			}
-		];
-	}
-	else if (entityType === 'Work') {
-		return [
-			{
-				entityIdField: 'languageSetId',
-				idField: 'id',
-				name: 'languageSet',
-				propName: 'languages'
-			}
-		];
-	}
-
-	return [];
-}
-
 /**
  * Returns all entity models defined in bookbrainz-data-js
  *