#154: Change endpoints dict to contain field name

- This is a change from containng an instance of the entity model, to make entities parsed round the API non-backend specific
ral-facilities · Oct 22, 2020 · 669a558 · 669a558
1 parent 17f9eec
commit 669a558
Showing 1 changed file with 39 additions and 79 deletions.
diff --git a/src/resources/entities/entity_map.py b/src/resources/entities/entity_map.py
@@ -1,86 +1,46 @@
-from common.database.models import (
-    APPLICATION,
-    DATACOLLECTIONDATAFILE,
-    DATACOLLECTIONPARAMETER,
-    DATACOLLECTIONDATASET,
-    DATACOLLECTION,
-    DATAFILEFORMAT,
-    DATAFILE,
-    FACILITYCYCLE,
-    DATASETTYPE,
-    GROUPING,
-    INSTRUMENT,
-    INSTRUMENTSCIENTIST,
-    INVESTIGATIONGROUP,
-    INVESTIGATIONINSTRUMENT,
-    INVESTIGATIONTYPE,
-    INVESTIGATION,
-    JOB,
-    KEYWORD,
-    PARAMETERTYPE,
-    INVESTIGATIONPARAMETER,
-    INVESTIGATIONUSER,
-    PUBLICSTEP,
-    RULE,
-    SAMPLE,
-    USERGROUP,
-    STUDYINVESTIGATION,
-    SAMPLETYPE,
-    RELATEDDATAFILE,
-    SAMPLEPARAMETER,
-    PUBLICATION,
-    STUDY,
-    USER,
-    SHIFT,
-    PERMISSIBLESTRINGVALUE,
-    FACILITY,
-    DATAFILEPARAMETER,
-    DATASET,
-    DATASETPARAMETER,
-)
-
 import datetime
 from sqlalchemy.inspection import inspect
 
+# endpoint_name: entity_name
 endpoints = {
-    "Applications": APPLICATION,
-    "DataCollectionDatafiles": DATACOLLECTIONDATAFILE,
-    "DataCollectionDatasets": DATACOLLECTIONDATASET,
-    "DataCollectionParameters": DATACOLLECTIONPARAMETER,
-    "DataCollections": DATACOLLECTION,
-    "DatafileFormats": DATAFILEFORMAT,
-    "DatafileParameters": DATAFILEPARAMETER,
-    "Datafiles": DATAFILE,
-    "DatasetParameters": DATASETPARAMETER,
-    "DatasetTypes": DATASETTYPE,
-    "Datasets": DATASET,
-    "Facilities": FACILITY,
-    "FacilityCycles": FACILITYCYCLE,
-    "Groupings": GROUPING,
-    "InstrumentScientists": INSTRUMENTSCIENTIST,
-    "Instruments": INSTRUMENT,
-    "InvestigationGroups": INVESTIGATIONGROUP,
-    "InvestigationInstruments": INVESTIGATIONINSTRUMENT,
-    "InvestigationParameters": INVESTIGATIONPARAMETER,
-    "InvestigationTypes": INVESTIGATIONTYPE,
-    "InvestigationUsers": INVESTIGATIONUSER,
-    "Investigations": INVESTIGATION,
-    "Jobs": JOB,
-    "Keywords": KEYWORD,
-    "ParameterTypes": PARAMETERTYPE,
-    "PermissibleStringValues": PERMISSIBLESTRINGVALUE,
-    "PublicSteps": PUBLICSTEP,
-    "Publications": PUBLICATION,
-    "RelatedDatafiles": RELATEDDATAFILE,
-    "Rules": RULE,
-    "SampleParameters": SAMPLEPARAMETER,
-    "SampleTypes": SAMPLETYPE,
-    "Samples": SAMPLE,
-    "Shifts": SHIFT,
-    "Studies": STUDY,
-    "StudyInvestigations": STUDYINVESTIGATION,
-    "UserGroups": USERGROUP,
-    "Users": USER,
+    "Applications": "Application",
+    "DataCollectionDatafiles": "DataCollectionDatafile",
+    "DataCollectionDatasets": "DataCollectionDataset",
+    "DataCollectionParameters": "DataCollectionParameter",
+    "DataCollections": "DataCollection",
+    "DatafileFormats": "DatafileFormat",
+    "DatafileParameters": "DatafileParameter",
+    "Datafiles": "Datafile",
+    "DatasetParameters": "DatasetParameter",
+    "DatasetTypes": "DatasetType",
+    "Datasets": "Dataset",
+    "Facilities": "Facility",
+    "FacilityCycles": "FacilityCycle",
+    "Groupings": "Grouping",
+    "InstrumentScientists": "InstrumentScientist",
+    "Instruments": "Instrument",
+    "InvestigationGroups": "InvestigationGroup",
+    "InvestigationInstruments": "InvestigationInstrument",
+    "InvestigationParameters": "InvestigationParameter",
+    "InvestigationTypes": "InvestigationType",
+    "InvestigationUsers": "InvestigationUser",
+    "Investigations": "Investigation",
+    "Jobs": "Job",
+    "Keywords": "Keyword",
+    "ParameterTypes": "ParameterType",
+    "PermissibleStringValues": "PermissibleStringValue",
+    "PublicSteps": "PublicStep",
+    "Publications": "Publication",
+    "RelatedDatafiles": "RelatedDatafile",
+    "Rules": "Rule",
+    "SampleParameters": "SampleParameter",
+    "SampleTypes": "SampleType",
+    "Samples": "Sample",
+    "Shifts": "Shift",
+    "Studies": "Study",
+    "StudyInvestigations": "StudyInvestigation",
+    "UserGroups": "UserGroup",
+    "Users": "User",
 }