Skip to content

Commit 893a703

Browse files
One more fix for the edge case
Signed-off-by: Lukasz Gryglicki <[email protected]>
1 parent d4537f3 commit 893a703

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

utils/get_all_current_documents_sf.sh

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,36 +21,36 @@ data=$(snowsql $(cat ./snowflake.secret) -o friendly=false -o header=false -o ti
2121
while read -r project_id project_name
2222
do
2323
template=$(snowsql $(cat ./snowflake.secret) -o friendly=false -o header=false -o timing=false -o output_format=plain -q "select data:project_individual_documents from ${TABLE} where project_id = '${project_id}'" | jq -r "${JQ}")
24-
if ( [ -z "${template}" ] || [ "${template}" = "null" ] )
24+
if ( [ -z "${template}" ] || [ "${template}" = "null" ] || [ -z "${project_name}" ] )
2525
then
2626
continue
2727
fi
28-
echo "ICLA ${project_id}"
28+
echo "ICLA ${project_id} - ${project_name}"
2929
if [ -n "${template_projects[$template]}" ]
3030
then
3131
template_projects["$template"]+=";${project_id}"
3232
else
3333
template_projects["$template"]="${project_id}"
3434
fi
3535
projects["$project_id"]="${project_name}"
36-
done < <(echo "${data}" | jq -r -c '.[] | "\(.project_id) \(.project_name)"')
36+
done < <(echo "${data}" | jq -r -c '.[] | select(.project_id != null and .project_name != null) | "\(.project_id) \(.project_name)"')
3737

3838
while read -r project_id project_name
3939
do
4040
template=$(snowsql $(cat ./snowflake.secret) -o friendly=false -o header=false -o timing=false -o output_format=plain -q "select data:project_corporate_documents from ${TABLE} where project_id = '${project_id}'" | jq -r "${JQ}")
41-
if ( [ -z "${template}" ] || [ "${template}" = "null" ] )
41+
if ( [ -z "${template}" ] || [ "${template}" = "null" ] || [ -z "${project_name}" ] )
4242
then
4343
continue
4444
fi
45-
echo "CCLA ${project_id}"
45+
echo "CCLA ${project_id} - ${project_name}"
4646
if [ -n "${template_projects[$template]}" ]
4747
then
4848
template_projects["$template"]+=";${project_id}"
4949
else
5050
template_projects["$template"]="${project_id}"
5151
fi
5252
projects["$project_id"]="${project_name}"
53-
done < <(echo "${data}" | jq -r -c '.[] | "\(.project_id) \(.project_name)"')
53+
done < <(echo "${data}" | jq -r -c '.[] | select(.project_id != null and .project_name != null) | "\(.project_id) \(.project_name)"')
5454

5555
# for template in "${!template_projects[@]}"
5656
for template in $(printf "%s\n" "${!template_projects[@]}" | sort)

0 commit comments

Comments
 (0)