changed cellLevel to cellLevelMeta

Signed-off-by: stefanbabukov <[email protected]>

src/api.v2/controllers/cellLevelController.js → src/api.v2/controllers/cellLevelMetaController.js

@@ -2,33 +2,33 @@ const { v4: uuidv4 } = require('uuid');
 const _ = require('lodash');
 const bucketNames = require('../../config/bucketNames');
 const sqlClient = require('../../sql/sqlClient');
-const CellLevel = require('../model/CellLevel');
-const CellLevelToExperiment = require('../model/CellLevelToExperiment');
+const CellLevelMeta = require('../model/CellLevelMeta');
+const CellLevelMetaToExperiment = require('../model/CellLevelMetaToExperiment');
 const { getFileUploadUrls } = require('../helpers/s3/signedUrl');
 const OK = require('../../utils/responses/OK');
 
 const uploadCellLevelMetadata = async (req, res) => {
   const { experimentId } = req.params;
   const { name, size } = req.body;
 
-  const cellLevelKey = uuidv4();
+  const cellLevelMetaKey = uuidv4();
   const bucketName = bucketNames.CELL_METADATA;
-  const newCellLevelFile = {
-    id: cellLevelKey,
+  const newCellLevelMetaFile = {
+    id: cellLevelMetaKey,
     name,
     upload_status: 'uploading',
   };
-  const cellLevelToExperimentMap = {
+  const cellLevelMetaToExperimentMap = {
     experiment_id: experimentId,
-    cell_metadata_file_id: cellLevelKey,
+    cell_metadata_file_id: cellLevelMetaKey,
   };
 
   let uploadUrlParams;
   await sqlClient.get().transaction(async (trx) => {
-    await new CellLevel(trx).create(newCellLevelFile);
-    await new CellLevelToExperiment(trx).create(cellLevelToExperimentMap);
-    uploadUrlParams = await getFileUploadUrls(cellLevelKey, {}, size, bucketName);
-    uploadUrlParams = { ...uploadUrlParams, fileId: cellLevelKey };
+    await new CellLevelMeta(trx).create(newCellLevelMetaFile);
+    await new CellLevelMetaToExperiment(trx).create(cellLevelMetaToExperimentMap);
+    uploadUrlParams = await getFileUploadUrls(cellLevelMetaKey, {}, size, bucketName);
+    uploadUrlParams = { ...uploadUrlParams, fileId: cellLevelMetaKey };
   });
 
   res.json({ data: uploadUrlParams });
@@ -38,8 +38,8 @@ const uploadCellLevelMetadata = async (req, res) => {
 const updateCellLevelMetadata = async (req, res) => {
   const { params: { experimentId }, body } = req;
   const snakeCasedKeysToPatch = _.mapKeys(body, (_value, key) => _.snakeCase(key));
-  const { cellMetadataFileId } = await new CellLevelToExperiment().find({ experiment_id: experimentId }).first();
-  await new CellLevel().updateById(cellMetadataFileId, snakeCasedKeysToPatch);
+  const { cellMetadataFileId } = await new CellLevelMetaToExperiment().find({ experiment_id: experimentId }).first();
+  await new CellLevelMeta().updateById(cellMetadataFileId, snakeCasedKeysToPatch);
   res.json(OK());
 };
 module.exports = {

src/api.v2/model/CellLevel.js → src/api.v2/model/CellLevelMeta.js

@@ -9,7 +9,7 @@ const fields = [
   'created_at',
 ];
 
-class CellLevel extends BasicModel {
+class CellLevelMeta extends BasicModel {
   constructor(sql = sqlClient.get()) {
     super(sql, tableNames.CELL_LEVEL, fields);
   }
@@ -29,4 +29,4 @@ class CellLevel extends BasicModel {
   }
 }
 
-module.exports = CellLevel;
+module.exports = CellLevelMeta;

src/api.v2/model/CellLevelToExperiment.js → src/api.v2/model/CellLevelMetaToExperiment.js

@@ -7,10 +7,10 @@ const fields = [
   'cell_metadata_file_id',
 ];
 
-class CellLevelToExperiment extends BasicModel {
+class CellLevelMetaToExperiment extends BasicModel {
   constructor(sql = sqlClient.get()) {
     super(sql, tableNames.CELL_LEVEL_TO_EXPERIMENT_MAP, fields);
   }
 }
 
-module.exports = CellLevelToExperiment;
+module.exports = CellLevelMetaToExperiment;

src/api.v2/model/Experiment.js

@@ -5,7 +5,7 @@ const { v4: uuidv4 } = require('uuid');
 const BasicModel = require('./BasicModel');
 const sqlClient = require('../../sql/sqlClient');
 const { collapseKeyIntoArray, replaceNullsWithObject } = require('../../sql/helpers');
-const CellLevel = require('./CellLevel');
+const CellLevelMeta = require('./CellLevelMeta');
 const { NotFoundError, BadRequestError } = require('../../utils/responses');
 const tableNames = require('./tableNames');
 const config = require('../../config');
@@ -77,11 +77,11 @@ class Experiment extends BasicModel {
       this.sql,
     );
 
-    const cellLevel = new CellLevel();
+    const cellLevelMeta = new CellLevelMeta();
     const experimentIds = experiments.map((experiment) => experiment.id);
-    const cellLevelResults = await cellLevel.getMetadataByExperimentIds(experimentIds);
+    const cellLevelMetaResults = await cellLevelMeta.getMetadataByExperimentIds(experimentIds);
 
-    cellLevelResults.forEach(
+    cellLevelMetaResults.forEach(
       (cellLevelMetaResult) => {
         const experimentIndx = experiments.findIndex(
           (experiment) => experiment.id === cellLevelMetaResult.experimentId,

src/api.v2/model/__mocks__/CellLevel.js → src/api.v2/model/__mocks__/CellLevelMeta.js

@@ -5,6 +5,6 @@ const stub = {
   ...BasicModel,
 };
 
-const CellLevel = jest.fn().mockImplementation(() => stub);
+const CellLevelMeta = jest.fn().mockImplementation(() => stub);
 
-module.exports = CellLevel;
+module.exports = CellLevelMeta;

src/api.v2/routes/cellLevel.js

@@ -1,6 +1,6 @@
 const {
   uploadCellLevelMetadata, updateCellLevelMetadata,
-} = require('../controllers/cellLevelController');
+} = require('../controllers/cellLevelMetaController');
 
 const { expressAuthorizationMiddleware } = require('../middlewares/authMiddlewares');
 

tests/api.v2/model/CellLevel.test.js → tests/api.v2/model/CellLevelMeta.test.js

@@ -1,6 +1,6 @@
 // @ts-nocheck
 const { mockSqlClient } = require('../mocks/getMockSqlClient')();
-const CellLevel = require('../../../src/api.v2/model/CellLevel');
+const CellLevel = require('../../../src/api.v2/model/CellLevelMeta');
 
 jest.mock('../../../src/sql/sqlClient', () => ({
   get: jest.fn(() => mockSqlClient),

tests/api.v2/model/Experiment.test.js

@@ -29,7 +29,7 @@ jest.mock('../../../src/sql/helpers', () => ({
       '{}'::jsonb
     ) as pipelines,}),`),
 }));
-jest.mock('../../../src/api.v2/model/CellLevel');
+jest.mock('../../../src/api.v2/model/CellLevelMeta');
 const Experiment = require('../../../src/api.v2/model/Experiment');
 const constants = require('../../../src/utils/constants');
 const tableNames = require('../../../src/api.v2/model/tableNames');