Skip to content

Commit

Permalink
#49: Update endpoints
Browse files Browse the repository at this point in the history
  • Loading branch information
keiranjprice101 committed Sep 30, 2019
1 parent f752db5 commit 846607b
Show file tree
Hide file tree
Showing 37 changed files with 75 additions and 111 deletions.
5 changes: 2 additions & 3 deletions src/resources/entities/applications_endpoints.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
from flask_restful import Resource

from common.database_helpers import get_row_by_id, delete_row_by_id, update_row_from_id, get_rows_by_filter, \
get_filtered_row_count, get_first_filtered_row, create_row_from_json, patch_entities
get_filtered_row_count, get_first_filtered_row, create_rows_from_json, patch_entities
from common.helpers import requires_session_id, queries_records, get_filters_from_query_string
from src.swagger.swagger_generator import swagger_gen

Expand All @@ -18,8 +18,7 @@ def get(self):
@requires_session_id
@queries_records
def post(self):
create_row_from_json(APPLICATION, request.json)
return get_row_by_id(APPLICATION, request.json["id"].to_dict()), 200
return create_rows_from_json(APPLICATION, request.json), 200

@requires_session_id
@queries_records
Expand Down
6 changes: 3 additions & 3 deletions src/resources/entities/datacollection_datafiles_endpoints.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
from flask_restful import Resource

from common.database_helpers import get_row_by_id, delete_row_by_id, update_row_from_id, get_rows_by_filter, \
get_filtered_row_count, get_first_filtered_row, create_row_from_json, patch_entities
get_filtered_row_count, get_first_filtered_row, create_rows_from_json, patch_entities
from common.helpers import requires_session_id, queries_records, get_filters_from_query_string
from common.models.db_models import DATACOLLECTIONDATAFILE
from src.swagger.swagger_generator import swagger_gen
Expand All @@ -18,8 +18,8 @@ def get(self):
@requires_session_id
@queries_records
def post(self):
create_row_from_json(DATACOLLECTIONDATAFILE, request.json)
return get_row_by_id(DATACOLLECTIONDATAFILE, request.json["id"].to_dict()), 200
return create_rows_from_json(DATACOLLECTIONDATAFILE, request.json), 200


@requires_session_id
@queries_records
Expand Down
5 changes: 2 additions & 3 deletions src/resources/entities/datacollection_datasets_endpoints.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
from flask_restful import Resource

from common.database_helpers import get_row_by_id, delete_row_by_id, update_row_from_id, get_rows_by_filter, \
get_filtered_row_count, get_first_filtered_row, create_row_from_json, patch_entities
get_filtered_row_count, get_first_filtered_row, create_rows_from_json, patch_entities
from common.helpers import requires_session_id, queries_records, get_filters_from_query_string
from common.models.db_models import DATACOLLECTIONDATASET
from src.swagger.swagger_generator import swagger_gen
Expand All @@ -18,8 +18,7 @@ def get(self):
@requires_session_id
@queries_records
def post(self):
create_row_from_json(DATACOLLECTIONDATASET, request.json)
return get_row_by_id(DATACOLLECTIONDATASET, request.json["id"].to_dict()), 200
return create_rows_from_json(DATACOLLECTIONDATASET, request.json), 200

@requires_session_id
@queries_records
Expand Down
5 changes: 2 additions & 3 deletions src/resources/entities/datacollection_parameters_endpoints.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
from flask_restful import Resource

from common.database_helpers import get_row_by_id, delete_row_by_id, update_row_from_id, get_rows_by_filter, \
get_filtered_row_count, get_first_filtered_row, create_row_from_json, patch_entities
get_filtered_row_count, get_first_filtered_row, patch_entities, create_rows_from_json
from common.helpers import requires_session_id, queries_records, get_filters_from_query_string
from common.models.db_models import DATACOLLECTIONPARAMETER
from src.swagger.swagger_generator import swagger_gen
Expand All @@ -18,8 +18,7 @@ def get(self):
@requires_session_id
@queries_records
def post(self):
create_row_from_json(DATACOLLECTIONPARAMETER, request.json)
return get_row_by_id(DATACOLLECTIONPARAMETER, request.json["id"].to_dict()), 200
return create_rows_from_json(DATACOLLECTIONPARAMETER, request.json), 200

@requires_session_id
@queries_records
Expand Down
5 changes: 2 additions & 3 deletions src/resources/entities/datacollections_endpoints.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
from flask_restful import Resource

from common.database_helpers import get_row_by_id, delete_row_by_id, update_row_from_id, get_rows_by_filter, \
get_filtered_row_count, get_first_filtered_row, create_row_from_json, patch_entities
get_filtered_row_count, get_first_filtered_row, create_rows_from_json, patch_entities
from common.helpers import requires_session_id, queries_records, get_filters_from_query_string
from common.models.db_models import DATACOLLECTION
from src.swagger.swagger_generator import swagger_gen
Expand All @@ -18,8 +18,7 @@ def get(self):
@requires_session_id
@queries_records
def post(self):
create_row_from_json(DATACOLLECTION, request.json)
return get_row_by_id(DATACOLLECTION, request.json["id"].to_dict()), 200
return create_rows_from_json(DATACOLLECTION, request.json), 200

@requires_session_id
@queries_records
Expand Down
5 changes: 2 additions & 3 deletions src/resources/entities/datafile_formats_endpoints.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
from flask_restful import Resource

from common.database_helpers import get_row_by_id, delete_row_by_id, update_row_from_id, get_rows_by_filter, \
get_filtered_row_count, get_first_filtered_row, create_row_from_json, patch_entities
get_filtered_row_count, get_first_filtered_row, create_rows_from_json, patch_entities
from common.helpers import requires_session_id, queries_records, get_filters_from_query_string
from common.models.db_models import DATAFILEFORMAT
from src.swagger.swagger_generator import swagger_gen
Expand All @@ -18,8 +18,7 @@ def get(self):
@requires_session_id
@queries_records
def post(self):
create_row_from_json(DATAFILEFORMAT, request.json)
return get_row_by_id(DATAFILEFORMAT, request.json["id"].to_dict()), 200
return create_rows_from_json(DATAFILEFORMAT, request.json), 200

@requires_session_id
@queries_records
Expand Down
5 changes: 2 additions & 3 deletions src/resources/entities/datafile_parameters_endpoints.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
from flask_restful import Resource

from common.database_helpers import get_row_by_id, delete_row_by_id, update_row_from_id, get_rows_by_filter, \
get_filtered_row_count, get_first_filtered_row, create_row_from_json, patch_entities
get_filtered_row_count, get_first_filtered_row, create_rows_from_json, patch_entities
from common.helpers import requires_session_id, queries_records, get_filters_from_query_string
from common.models.db_models import DATAFILEPARAMETER
from src.swagger.swagger_generator import swagger_gen
Expand All @@ -18,8 +18,7 @@ def get(self):
@requires_session_id
@queries_records
def post(self):
create_row_from_json(DATAFILEPARAMETER, request.json)
return get_row_by_id(DATAFILEPARAMETER, request.json["id"].to_dict()), 200
return create_rows_from_json(DATAFILEPARAMETER, request.json), 200

@requires_session_id
@queries_records
Expand Down
5 changes: 2 additions & 3 deletions src/resources/entities/datafiles_endpoints.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
from flask_restful import Resource

from common.database_helpers import get_row_by_id, delete_row_by_id, update_row_from_id, get_rows_by_filter, \
get_filtered_row_count, get_first_filtered_row, create_row_from_json, patch_entities
get_filtered_row_count, get_first_filtered_row, create_rows_from_json, patch_entities
from common.helpers import requires_session_id, queries_records, get_filters_from_query_string
from common.models.db_models import DATAFILE
from src.swagger.swagger_generator import swagger_gen
Expand All @@ -18,8 +18,7 @@ def get(self):
@requires_session_id
@queries_records
def post(self):
create_row_from_json(DATAFILE, request.json)
return "", 200
return create_rows_from_json(DATAFILE, request.json), 200

@requires_session_id
@queries_records
Expand Down
5 changes: 2 additions & 3 deletions src/resources/entities/dataset_type_endpoints.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
from flask_restful import Resource

from common.database_helpers import get_row_by_id, delete_row_by_id, update_row_from_id, get_rows_by_filter, \
get_filtered_row_count, get_first_filtered_row, create_row_from_json, patch_entities
get_filtered_row_count, get_first_filtered_row, create_rows_from_json, patch_entities
from common.helpers import requires_session_id, queries_records, get_filters_from_query_string
from common.models.db_models import DATASETTYPE
from src.swagger.swagger_generator import swagger_gen
Expand All @@ -18,8 +18,7 @@ def get(self):
@requires_session_id
@queries_records
def post(self):
create_row_from_json(DATASETTYPE, request.json)
return get_row_by_id(DATASETTYPE, request.json["id"].to_dict()), 200
return create_rows_from_json(DATASETTYPE, request.json), 200

@requires_session_id
@queries_records
Expand Down
5 changes: 2 additions & 3 deletions src/resources/entities/datasets_endpoints.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
from flask_restful import Resource

from common.database_helpers import get_row_by_id, delete_row_by_id, update_row_from_id, get_rows_by_filter, \
get_filtered_row_count, get_first_filtered_row, create_row_from_json, patch_entities
get_filtered_row_count, get_first_filtered_row, create_rows_from_json, patch_entities
from common.helpers import requires_session_id, queries_records, get_filters_from_query_string
from common.models.db_models import DATASET
from src.swagger.swagger_generator import swagger_gen
Expand All @@ -18,8 +18,7 @@ def get(self):
@requires_session_id
@queries_records
def post(self):
create_row_from_json(DATASET, request.json)
return get_row_by_id(DATASET, request.json["id"].to_dict()), 200
return create_rows_from_json(DATASET, request.json), 200

@requires_session_id
@queries_records
Expand Down
5 changes: 2 additions & 3 deletions src/resources/entities/facilities_endpoints.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
from flask_restful import Resource

from common.database_helpers import get_row_by_id, delete_row_by_id, update_row_from_id, get_rows_by_filter, \
get_filtered_row_count, get_first_filtered_row, create_row_from_json, patch_entities
get_filtered_row_count, get_first_filtered_row, create_rows_from_json, patch_entities
from common.helpers import requires_session_id, queries_records, get_filters_from_query_string
from common.models.db_models import FACILITY
from src.swagger.swagger_generator import swagger_gen
Expand All @@ -18,8 +18,7 @@ def get(self):
@requires_session_id
@queries_records
def post(self):
create_row_from_json(FACILITY, request.json)
return get_row_by_id(FACILITY, request.json["id"].to_dict()), 200
return create_rows_from_json(FACILITY, request.json), 200

@requires_session_id
@queries_records
Expand Down
5 changes: 2 additions & 3 deletions src/resources/entities/facility_cycles_endpoints.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
from flask_restful import Resource

from common.database_helpers import get_row_by_id, delete_row_by_id, update_row_from_id, get_rows_by_filter, \
get_filtered_row_count, get_first_filtered_row, create_row_from_json, patch_entities
get_filtered_row_count, get_first_filtered_row, create_rows_from_json, patch_entities
from common.helpers import requires_session_id, queries_records, get_filters_from_query_string
from common.models.db_models import FACILITYCYCLE
from src.swagger.swagger_generator import swagger_gen
Expand All @@ -18,8 +18,7 @@ def get(self):
@requires_session_id
@queries_records
def post(self):
create_row_from_json(FACILITYCYCLE, request.json)
return get_row_by_id(FACILITYCYCLE, request.json["id"].to_dict()), 200
return create_rows_from_json(FACILITYCYCLE, request.json), 200

@requires_session_id
@queries_records
Expand Down
5 changes: 2 additions & 3 deletions src/resources/entities/groupings_endpoints.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
from flask_restful import Resource

from common.database_helpers import get_row_by_id, delete_row_by_id, update_row_from_id, get_rows_by_filter, \
get_filtered_row_count, get_first_filtered_row, create_row_from_json, patch_entities
get_filtered_row_count, get_first_filtered_row, create_rows_from_json, patch_entities
from common.helpers import requires_session_id, queries_records, get_filters_from_query_string
from common.models.db_models import GROUPING
from src.swagger.swagger_generator import swagger_gen
Expand All @@ -18,8 +18,7 @@ def get(self):
@requires_session_id
@queries_records
def post(self):
create_row_from_json(GROUPING, request.json)
return get_row_by_id(GROUPING, request.json["id"].to_dict()), 200
return create_rows_from_json(GROUPING, request.json), 200

@requires_session_id
@queries_records
Expand Down
5 changes: 2 additions & 3 deletions src/resources/entities/instrument_scientists_endpoints.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
from flask_restful import Resource

from common.database_helpers import get_row_by_id, delete_row_by_id, update_row_from_id, get_rows_by_filter, \
get_filtered_row_count, get_first_filtered_row, create_row_from_json, patch_entities
get_filtered_row_count, get_first_filtered_row, create_rows_from_json, patch_entities
from common.helpers import requires_session_id, queries_records, get_filters_from_query_string
from common.models.db_models import INSTRUMENTSCIENTIST
from src.swagger.swagger_generator import swagger_gen
Expand All @@ -18,8 +18,7 @@ def get(self):
@requires_session_id
@queries_records
def post(self):
create_row_from_json(INSTRUMENTSCIENTIST, request.json)
return get_row_by_id(INSTRUMENTSCIENTIST, request.json["id"].to_dict()), 200
return create_rows_from_json(INSTRUMENTSCIENTIST, request.json), 200

@requires_session_id
@queries_records
Expand Down
5 changes: 2 additions & 3 deletions src/resources/entities/instruments_endpoints.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
from flask_restful import Resource

from common.database_helpers import get_row_by_id, delete_row_by_id, update_row_from_id, get_rows_by_filter, \
get_filtered_row_count, get_first_filtered_row, create_row_from_json, patch_entities
get_filtered_row_count, get_first_filtered_row, create_rows_from_json, patch_entities
from common.helpers import requires_session_id, queries_records, get_filters_from_query_string
from common.models.db_models import INSTRUMENT
from src.swagger.swagger_generator import swagger_gen
Expand All @@ -18,8 +18,7 @@ def get(self):
@requires_session_id
@queries_records
def post(self):
create_row_from_json(INSTRUMENT, request.json)
return get_row_by_id(INSTRUMENT, request.json["id"].to_dict()), 200
return create_rows_from_json(INSTRUMENT, request.json), 200

@requires_session_id
@queries_records
Expand Down
5 changes: 2 additions & 3 deletions src/resources/entities/investigation_groups_endpoints.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
from flask_restful import Resource

from common.database_helpers import get_row_by_id, delete_row_by_id, update_row_from_id, get_rows_by_filter, \
get_filtered_row_count, get_first_filtered_row, create_row_from_json, patch_entities
get_filtered_row_count, get_first_filtered_row, create_rows_from_json, patch_entities
from common.helpers import requires_session_id, queries_records, get_filters_from_query_string
from common.models.db_models import INVESTIGATIONGROUP
from src.swagger.swagger_generator import swagger_gen
Expand All @@ -18,8 +18,7 @@ def get(self):
@requires_session_id
@queries_records
def post(self):
create_row_from_json(INVESTIGATIONGROUP, request.json)
return get_row_by_id(INVESTIGATIONGROUP, request.json["id"].to_dict()), 200
return create_rows_from_json(INVESTIGATIONGROUP, request.json), 200

@requires_session_id
@queries_records
Expand Down
5 changes: 2 additions & 3 deletions src/resources/entities/investigation_instruments_endpoints.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
from flask_restful import Resource

from common.database_helpers import get_row_by_id, delete_row_by_id, update_row_from_id, get_rows_by_filter, \
get_filtered_row_count, get_first_filtered_row, create_row_from_json, patch_entities
get_filtered_row_count, get_first_filtered_row, create_rows_from_json, patch_entities
from common.helpers import requires_session_id, queries_records, get_filters_from_query_string
from common.models.db_models import INVESTIGATIONINSTRUMENT
from src.swagger.swagger_generator import swagger_gen
Expand All @@ -18,8 +18,7 @@ def get(self):
@requires_session_id
@queries_records
def post(self):
create_row_from_json(INVESTIGATIONINSTRUMENT, request.json)
return get_row_by_id(INVESTIGATIONINSTRUMENT, request.json["id"].to_dict()), 200
return create_rows_from_json(INVESTIGATIONINSTRUMENT, request.json), 200

@requires_session_id
@queries_records
Expand Down
5 changes: 2 additions & 3 deletions src/resources/entities/investigation_parameters_endpoints.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
from flask_restful import Resource

from common.database_helpers import get_row_by_id, delete_row_by_id, update_row_from_id, get_rows_by_filter, \
get_filtered_row_count, get_first_filtered_row, create_row_from_json, patch_entities
get_filtered_row_count, get_first_filtered_row, create_rows_from_json, patch_entities
from common.helpers import requires_session_id, queries_records, get_filters_from_query_string
from common.models.db_models import INVESTIGATIONPARAMETER
from src.swagger.swagger_generator import swagger_gen
Expand All @@ -18,8 +18,7 @@ def get(self):
@requires_session_id
@queries_records
def post(self):
create_row_from_json(INVESTIGATIONPARAMETER, request.json)
return get_row_by_id(INVESTIGATIONPARAMETER, request.json["id"].to_dict()), 200
return create_rows_from_json(INVESTIGATIONPARAMETER, request.json), 200

@requires_session_id
@queries_records
Expand Down
5 changes: 2 additions & 3 deletions src/resources/entities/investigation_types_endpoints.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
from flask_restful import Resource

from common.database_helpers import get_row_by_id, delete_row_by_id, update_row_from_id, get_rows_by_filter, \
get_filtered_row_count, get_first_filtered_row, create_row_from_json, patch_entities
get_filtered_row_count, get_first_filtered_row, create_rows_from_json, patch_entities
from common.helpers import requires_session_id, queries_records, get_filters_from_query_string
from common.models.db_models import INVESTIGATIONTYPE
from src.swagger.swagger_generator import swagger_gen
Expand All @@ -18,8 +18,7 @@ def get(self):
@requires_session_id
@queries_records
def post(self):
create_row_from_json(INVESTIGATIONTYPE, request.json)
return get_row_by_id(INVESTIGATIONTYPE, request.json["id"].to_dict()), 200
return create_rows_from_json(INVESTIGATIONTYPE, request.json), 200

@requires_session_id
@queries_records
Expand Down
5 changes: 2 additions & 3 deletions src/resources/entities/investigation_users_endpoints.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
from flask_restful import Resource

from common.database_helpers import get_row_by_id, delete_row_by_id, update_row_from_id, get_rows_by_filter, \
get_filtered_row_count, get_first_filtered_row, create_row_from_json, patch_entities
get_filtered_row_count, get_first_filtered_row, create_rows_from_json, patch_entities
from common.helpers import requires_session_id, queries_records, get_filters_from_query_string
from common.models.db_models import INVESTIGATIONUSER
from src.swagger.swagger_generator import swagger_gen
Expand All @@ -18,8 +18,7 @@ def get(self):
@requires_session_id
@queries_records
def post(self):
create_row_from_json(INVESTIGATIONUSER, request.json)
return get_row_by_id(INVESTIGATIONUSER, request.json["id"].to_dict()), 200
return create_rows_from_json(INVESTIGATIONUSER, request.json), 200

@requires_session_id
@queries_records
Expand Down
5 changes: 2 additions & 3 deletions src/resources/entities/investigations_endpoints.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
from flask_restful import Resource

from common.database_helpers import get_row_by_id, delete_row_by_id, update_row_from_id, get_rows_by_filter, \
get_filtered_row_count, get_first_filtered_row, create_row_from_json, patch_entities
get_filtered_row_count, get_first_filtered_row, create_rows_from_json, patch_entities
from common.helpers import requires_session_id, queries_records, get_filters_from_query_string
from common.models.db_models import INVESTIGATION
from src.swagger.swagger_generator import swagger_gen
Expand All @@ -18,8 +18,7 @@ def get(self):
@requires_session_id
@queries_records
def post(self):
create_row_from_json(INVESTIGATION, request.json)
return get_row_by_id(INVESTIGATION, request.json["id"].to_dict()), 200
return create_rows_from_json(INVESTIGATION, request.json), 200

@requires_session_id
@queries_records
Expand Down
Loading

0 comments on commit 846607b

Please sign in to comment.