Code

ICAT to PaNOSC Data Model Conversion#300

Code

Merged

MRichards99 merged 49 commits intomasterral-facilities/datagateway-api:masterfrom feature/icat-to-panosc-data-model-conversion-#265ral-facilities/datagateway-api:feature/icat-to-panosc-data-model-conversion-#265Copy head branch name to clipboardJan 31, 2022

+1,228-192

Commits

Commits on Jan 4, 2022

• feat: implement basic version of SearchAPIIncludeFilter #261

  MRichards99

  committed
  f2f53c9

  Copy full SHA for f2f53c9

• refactor: move get_icat_mapping() into PaNOSCMappings #261

  Show description for 00ee21d
  MRichards99

  committed
  00ee21d

  Copy full SHA for 00ee21d

Commits on Jan 6, 2022

• test: add tests for SearchAPIIncludeFilter #261

  MRichards99

  committed
  fc4556c

  Copy full SHA for fc4556c

Commits on Jan 7, 2022

• conversion proof of concept #265

  

  Viktor Bozhinov

  committed
  85c4bfc

  Copy full SHA for 85c4bfc

Commits on Jan 10, 2022

• refactor: make query params more efficient to create less include filter objects for multiple and nested related entities #261

  MRichards99

  committed
  eab7f3d

  Copy full SHA for eab7f3d

• Merge branch 'filter-input-conversion' into feature/search-api-include-filter-#261

  MRichards99

  committed
  95319a8

  Copy full SHA for 95319a8

Commits on Jan 12, 2022

• Merge branch 'feature/search-api-include-filter-#261' into feature/icat-to-panosc-data-model-conversion-#265

  VKTB

  committed
  3d8447e

  Copy full SHA for 3d8447e

Commits on Jan 17, 2022

• refactor: address TODO in models.py #265

  VKTB

  committed
  b0983bb

  Copy full SHA for b0983bb

• refactor: make field types non-strict #265

  VKTB

  committed
  3cbf11b

  Copy full SHA for 3cbf11b

• set non-related optional entity fields to default to None #265

  VKTB

  committed
  c183a85

  Copy full SHA for c183a85

• set signular related entity fields to default to None #265

  VKTB

  committed
  ea29f47

  Copy full SHA for ea29f47

• set plural entity fields to default to empty list #265

  VKTB

  committed
  ce9e2af

  Copy full SHA for ce9e2af

• refactor: deal with case when list of ICAT field names are found #265

  VKTB

  committed
  956a902

  Copy full SHA for 956a902

• refactor: deal with case when list of ICAT field values are found #265

  VKTB

  committed
  98f9157

  Copy full SHA for 98f9157

• feature: deal with required related entity cases #265

  VKTB

  committed
  3ceb365

  Copy full SHA for 3ceb365

• disable dataset and document validator in Parameter entity #265

  VKTB

  committed
  94dcfba

  Copy full SHA for 94dcfba

• work out if dataset or document is public #265

  VKTB

  committed
  eca0a46

  Copy full SHA for eca0a46

• test: define test data #265

  VKTB

  committed
  66f0261

  Copy full SHA for 66f0261

• test: unit test from_icat Affiliation entity creation #265

  VKTB

  committed
  07058a0

  Copy full SHA for 07058a0

• test: unit test from_icat Dataset entity creation #265

  VKTB

  committed
  3631c61

  Copy full SHA for 3631c61

• test: unit test from_icat Dataset entity creation #265

  VKTB

  committed
  8f2a6c1

  Copy full SHA for 8f2a6c1

• test: unit test from_icat File entity creation #265

  VKTB

  committed
  0554bea

  Copy full SHA for 0554bea

• test: unit test from_icat Instrument entity creation #265

  VKTB

  committed
  0d0a1e4

  Copy full SHA for 0d0a1e4

• test: unit test from_icat Member entity creation #265

  VKTB

  committed
  f2845e3

  Copy full SHA for f2845e3

• test: unit test from_icat Parameter entity creation #265

  VKTB

  committed
  faed594

  Copy full SHA for faed594

• test: unit test from_icat Person entity creation #265

  VKTB

  committed
  c05a70d

  Copy full SHA for c05a70d

• test: unit test from_icat Sample entity creation #265

  VKTB

  committed
  077c279

  Copy full SHA for 077c279

• test: unit test from_icat Technique entity creation #265

  VKTB

  committed
  fb836c7

  Copy full SHA for fb836c7

• test: unit test from_icat raises ValidationError #265

  VKTB

  committed
  701eb74

  Copy full SHA for 701eb74

Commits on Jan 18, 2022

• update Parameter mappings in example file #265

  VKTB

  committed
  e691f24

  Copy full SHA for e691f24

Commits on Jan 24, 2022

• add logic for dealing with nested required related fields #265

  VKTB

  committed
  d606d6b

  Copy full SHA for d606d6b

• test: unit test logic for nested required related fields #265

  VKTB

  committed
  e52d595

  Copy full SHA for e52d595

Commits on Jan 26, 2022

• Merge branch 'filter-input-conversion' into feature/icat-to-panosc-data-model-conversion-#265

  MRichards99

  committed
  7f4cd96

  Copy full SHA for 7f4cd96

Commits on Jan 28, 2022

• refactor: update PaNOSC Parameter mappings in example file #265

  VKTB

  committed
  601c51b

  Copy full SHA for 601c51b

• test: update Parameter mappings in mappings fixture #265

  VKTB

  committed
  1e8badb

  Copy full SHA for 1e8badb

• test: fix tests following updates to PaNOSC Parameter mappings #265

  VKTB

  committed
  d595ceb

  Copy full SHA for d595ceb

• refactor: replace fromisoformat with str_to_datetime_object #265

  VKTB

  committed
  0bbcc0d

  Copy full SHA for 0bbcc0d

• Apply suggestions from code review #265

  Show description for 299cbcd
  

  VKTB

  and

  MRichards99

  authored
  299cbcd

  Copy full SHA for 299cbcd

• Merge branch 'feature/icat-to-panosc-data-model-conversion-#265' of github.com:ral-facilities/datagateway-api into feature/icat-to-panosc-data-model-conversion-#265

  VKTB

  committed
  3f463fb

  Copy full SHA for 3f463fb

• docs: add new comments and fix existing #265

  VKTB

  committed
  3f1b1cf

  Copy full SHA for 3f1b1cf

• refactor: refactor _get_icat_field_value logic #265

  VKTB

  committed
  1d730d1

  Copy full SHA for 1d730d1

• test: remove code for replacing datetime timezone #265

  VKTB

  committed
  5571722

  Copy full SHA for 5571722

• refactor: refactor from_icat abstract method #265

  VKTB

  committed
  71765a5

  Copy full SHA for 71765a5

Commits on Jan 31, 2022

• fix: fix list type field checking in Python 3.6 #265

  VKTB

  committed
  691a59e

  Copy full SHA for 691a59e

• style: address linting warnings #265

  VKTB

  committed
  a253422

  Copy full SHA for a253422

• style: fix typo #265

  MRichards99

  committed
  3f1b2d6

  Copy full SHA for 3f1b2d6

• Merge branch 'master' into feature/icat-to-panosc-data-model-conversion-#265

  MRichards99

  committed
  fca1a59

  Copy full SHA for fca1a59

• refactor: update PaNOSC Parameter name mapping in example file #265

  VKTB

  committed
  358ac22

  Copy full SHA for 358ac22

• Merge branch 'master' into feature/icat-to-panosc-data-model-conversion-#265

  MRichards99

  committed
  f17038d

  Copy full SHA for f17038d