From 1c52253f62765d0f5962daa259b6575aed14f8a5 Mon Sep 17 00:00:00 2001
From: Jorrit Schaap <schaap@astron.nl>
Date: Fri, 7 Jun 2019 09:54:56 +0000
Subject: [PATCH] SW-699: minor fixes
---
.../LTAIngestAdminServer/lib/ingestmomadapter.py | 2 +-
.../MoMQueryServiceServer/momqueryservice.py | 14 +++++++-------
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/LTA/LTAIngest/LTAIngestServer/LTAIngestAdminServer/lib/ingestmomadapter.py b/LTA/LTAIngest/LTAIngestServer/LTAIngestAdminServer/lib/ingestmomadapter.py
index df764a27ff4..8f38bbeb12f 100644
--- a/LTA/LTAIngest/LTAIngestServer/LTAIngestAdminServer/lib/ingestmomadapter.py
+++ b/LTA/LTAIngest/LTAIngestServer/LTAIngestAdminServer/lib/ingestmomadapter.py
@@ -120,7 +120,7 @@ class IngestEventMessageHandlerForMomAdapter(IngestEventMessageHandler):
dps = self._momrpc.getDataProducts(mom2id).get(mom2id)
- if len(dps) <= 0:
+ if dps is None or len(dps) <= 0:
return
ingested_dps = [dp for dp in dps if dp['status'] == 'ingested']
diff --git a/SAS/MoM/MoMQueryService/MoMQueryServiceServer/momqueryservice.py b/SAS/MoM/MoMQueryService/MoMQueryServiceServer/momqueryservice.py
index 779ec2b204b..a9efd6f02b2 100755
--- a/SAS/MoM/MoMQueryService/MoMQueryServiceServer/momqueryservice.py
+++ b/SAS/MoM/MoMQueryService/MoMQueryServiceServer/momqueryservice.py
@@ -549,14 +549,14 @@ where mom2object.name = %s"""
logger.info("get_project_details for mom_id: %s", mom_id)
query = """SELECT project_role.name, user.email FROM mom2object as project
-join member as member on member.projectid=project.ownerprojectid
+join member as member on member.projectid=project.id
join registeredmember as registered_member on registered_member.memberid=member.id
join """ + self.useradministration_db + """.useraccount as useraccount on registered_member.userid=useraccount.id
join """ + self.useradministration_db + """.user as user on user.id=useraccount.id
join memberprojectrole as member_project_role on member_project_role.memberid=member.id
join projectrole as project_role on project_role.id=member_project_role.projectroleid
where project.mom2id = %s and (project_role.name = "Pi" or project_role.name = "Contact author");"""
- parameters = (mom_id, )
+ parameters = (mom_id,)
rows = self._executeSelectQuery(query, parameters)
@@ -1160,13 +1160,13 @@ where project.mom2id = %s and (project_role.name = "Pi" or project_role.name = "
result[mom2id] = []
for row in rows:
- if str(row['mom2id']) in result:
- result[str(row['mom2id'])].append(dict(row))
+ if row['mom2id'] in result:
+ result[row['mom2id']].append(dict(row))
else:
- if str(row['parent_mom2id']) not in result:
- result[str(row['parent_mom2id'])] = []
+ if row['parent_mom2id'] not in result:
+ result[row['parent_mom2id']] = []
- result[str(row['parent_mom2id'])].append(dict(row))
+ result[row['parent_mom2id']].append(dict(row))
for mom2id, dps in list(result.items()):
logger.info('Found %s dataproducts for mom2id %s', len(dps), mom2id)
--
GitLab