Skip to content

Commit

Permalink
Create an inspection from a json form (#79)
Browse files Browse the repository at this point in the history 
* Issue #68: Split Datastore

* Issue #68: Fix lint

* Issue #77: sql function created

* Issue #777 fix schema

* Issue #77: Fix function

* iSSUE #77 FIX FUNCTION

* Issue #77: f fix

* Issue #77: Function passing through

* Issue #77: test build

* issue #77: fix tests

* Issue #77: positive test is passing

* Issue #77: formated output

* Issue #77 Update Secrets

* Issue #77: metadata

* Issue #77: Updated the inspection Metadata

* Issue #68: Formatting module Metadata

* Issue #68: tests are passing

* Issue #77: change metric_type for enum

* Issue #77: updated Architecture

* Issue #77: lint

* save pipeline_id

* fixes

* fix tests

* Issue #77: Update based on review

* Issue #77: Fix link .md

* Issue #68: fix file path in tests

* rename bin tests

* issue #77: Fix test

* Issue #77: All tests are passing

* Issue #77: update pyproject

* Issue #77: doc about saving inspection

* issue #77: fix typo doc

* Fix #77 review

* #77 lint fix

---------

Co-authored-by: sylvanie85 <[email protected]>
  • Loading branch information
@Francois-Werbrouck @sylvanie85
Francois-Werbrouck and sylvanie85 authored Jul 30, 2024
1 parent 875212a commit cb204a0
Show file tree
Hide file tree
Showing 49 changed files with 2,218 additions and 414 deletions.
49 changes: 0 additions & 49 deletions datastore/FertiScan/__init__.py
View file

This file was deleted.

6 changes: 4 additions & 2 deletions datastore/__init__.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,9 @@ async def new_user(cursor, email, connection_string, tier="user") -> User:
raise Exception("Datastore Unhandled Error")


async def get_user_container_client(user_id, storage_url, account, key, tier="user"):
async def get_user_container_client(
user_id, storage_url, account, key, tier="user"
):
"""
Get the container client of a user
Expand Down Expand Up @@ -308,7 +310,7 @@ async def upload_pictures(
if not response:
raise BlobUploadError("Error uploading the picture")

picture.update_picture_metadata(cursor, picture_id, json.dumps(data), 0)
picture.update_picture_metadata(cursor, picture_id, json.dumps(data), len(hashed_pictures))
pic_ids.append(picture_id)
return pic_ids
except BlobUploadError or azure_storage.UploadImageError:
Expand Down
310 changes: 310 additions & 0 deletions datastore/db/bytebase/FertiScan/new_inspection_function.sql
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,310 @@
CREATE OR REPLACE FUNCTION "fertiscan_0.0.9".new_inspection(user_id uuid, picture_set_id uuid, input_json jsonb)
RETURNS jsonb
LANGUAGE plpgsql
AS $function$
DECLARE
label_id uuid;
sub_type_rec RECORD;
fr_values jsonb;
en_values jsonb;
read_language text;
record jsonb;
inspection_id uuid;
company_id uuid;
location_id uuid;
manufacturer_location_id uuid;
manufacturer_id uuid;
read_value text;
read_unit text;
metric_type_id uuid;
value_float float;
unit_id uuid;
specification_id uuid;
sub_label_id uuid;
ingredient_language text;
result_json jsonb := '{}';
BEGIN

-- COMPANY
-- Check if company location exists by address
SELECT id INTO location_id
FROM location
WHERE address ILIKE input_json->'company'->>'address'
LIMIT 1;

IF location_id IS NULL THEN
INSERT INTO location (address)
VALUES (
input_json->'company'->>'address'
)
RETURNING id INTO location_id;
END IF;
INSERT INTO organization_information (name,website,phone_number,location_id)
VALUES (
input_json->'company'->>'name',
input_json->'company'->>'website',
input_json->'company'->>'phone_number',
location_id
)
RETURNING id INTO company_id;

-- Update input_json with company_id
input_json := jsonb_set(input_json, '{company,id}', to_jsonb(company_id));

-- COMPANY END

-- MANUFACTURER
-- Check if company location exists by address
SELECT id INTO location_id
FROM location
WHERE address ILIKE input_json->'manufacturer'->>'address'
LIMIT 1;

IF location_id IS NULL THEN
INSERT INTO location (address)
VALUES (
input_json->'manufacturer'->>'address'
)
RETURNING id INTO location_id;
END IF;
INSERT INTO organization_information (name,website,phone_number,location_id)
VALUES (
input_json->'manufacturer'->>'name',
input_json->'manufacturer'->>'website',
input_json->'manufacturer'->>'phone_number',
location_id
)
RETURNING id INTO manufacturer_id;

-- Update input_json with company_id
input_json := jsonb_set(input_json, '{manufacturer,id}', to_jsonb(manufacturer_id));
-- Manufacturer end

-- LABEL INFORMATION
INSERT INTO label_information (
lot_number, npk, registration_number, n, p, k, company_info_id, manufacturer_info_id
) VALUES (
input_json->'product'->>'lot_number',
input_json->'product'->>'npk',
input_json->'product'->>'registration_number',
(input_json->'product'->>'n')::float,
(input_json->'product'->>'p')::float,
(input_json->'product'->>'k')::float,
company_id,
manufacturer_id
)
RETURNING id INTO label_id;

-- Update input_json with company_id
input_json := jsonb_set(input_json, '{product,id}', to_jsonb(label_id));

--LABEL END

--WEIGHT
-- Loop through each element in the 'weight' array
FOR record IN SELECT * FROM jsonb_array_elements(input_json->'weight')
LOOP
-- Extract the value and unit from the current weight record
read_value := record->>'value';
read_unit := record->>'unit';

-- Convert the weight value to float
value_float := read_value::float;

-- Check if the weight_unit exists in the unit table
SELECT id INTO unit_id FROM unit WHERE unit = read_unit;

-- If unit_id is null, the unit does not exist
IF unit_id IS NULL THEN
-- Insert the new unit
INSERT INTO unit (unit, to_si_unit)
VALUES (read_unit, null) -- Adjust to_si_unit value as necessary
RETURNING id INTO unit_id;
END IF;

-- Insert into metric for weight
INSERT INTO metric (value, unit_id, edited,metric_type_id,label_id)
VALUES (value_float, unit_id, FALSE,'weight'::"fertiscan_0.0.9".metric_type,label_id);
END LOOP;
-- Weight end

--DENSITY
read_value := input_json -> 'product' -> 'density'->> 'value';
read_unit := input_json -> 'product' -> 'density'->> 'unit';
-- Check if density_value is not null and handle density_unit
IF read_value IS NOT NULL THEN
value_float = read_value::float;
-- Check if the density_unit exists in the unit table
SELECT id INTO unit_id FROM unit WHERE unit = read_unit;

-- If unit_id is null, the unit does not exist
IF unit_id IS NULL THEN
-- Insert the new unit
INSERT INTO unit (unit, to_si_unit)
VALUES (read_unit, null) -- Adjust to_si_unit value as necessary
RETURNING id INTO unit_id;
END IF;

-- Insert into metric for weight
INSERT INTO metric (value, unit_id, edited,metric_type_id,label_id)
VALUES (value_float, unit_id, FALSE,'density'::"fertiscan_0.0.9".metric_type,label_id);
END IF;
-- DENSITY END

--VOLUME
read_value := input_json -> 'product' -> 'volume'->> 'value';
read_unit := input_json -> 'product' -> 'volume'->> 'unit';
-- Check if density_value is not null and handle density_unit
IF read_value IS NOT NULL THEN
value_float = read_value::float;
-- Check if the density_unit exists in the unit table
SELECT id INTO unit_id FROM unit WHERE unit = read_unit;

-- If unit_id is null, the unit does not exist
IF unit_id IS NULL THEN
-- Insert the new unit
INSERT INTO unit (unit, to_si_unit)
VALUES (read_unit, null) -- Adjust to_si_unit value as necessary
RETURNING id INTO unit_id;
END IF;

-- Insert into metric for weight
INSERT INTO metric (value, unit_id, edited,metric_type_id,label_id)
VALUES (value_float, unit_id, FALSE,'volume'::"fertiscan_0.0.9".metric_type,label_id);
END IF;
-- Volume end

-- SPECIFICATION
FOR ingredient_language IN SELECT * FROM jsonb_object_keys(input_json->'specifications')
LOOP
FOR record IN SELECT * FROM jsonb_array_elements(input_json->'specifications'->ingredient_language)
LOOP
INSERT INTO specification (humidity, ph, solubility, edited,LANGUAGE,label_id)
VALUES (
(record->>'humidity')::float,
(record->>'ph')::float,
(record->>'solubility')::float,
FALSE,
ingredient_language::"nachet_0.0.9".language,
label_id
);
END LOOP;
END LOOP;
-- SPECIFICATION END

-- INGREDIENTS

-- Loop through each language ('en' and 'fr')
FOR ingredient_language IN SELECT * FROM jsonb_object_keys(input_json->'ingredients')
LOOP
-- Loop through each ingredient in the current language
FOR record IN SELECT * FROM jsonb_array_elements(input_json->'ingredients'->ingredient_language )
LOOP
-- Extract values from the current ingredient record
read_value := record->> 'value';
read_unit := record ->> 'unit';
value_float := read_value::float;
INSERT INTO ingredient (organic, active, name, value, unit, edited, label_id, language)
VALUES (
Null, -- we cant tell
Null, -- We cant tell
record->>'name',
value_float,
read_unit,
FALSE, -- Assuming edited status
label_id,
ingredient_language::"nachet_0.0.9".language
);
END LOOP;
END LOOP;
--INGREDIENTS ENDS

-- SUB LABELS
-- Loop through each sub_type
FOR sub_type_rec IN SELECT id,type_en FROM sub_type
LOOP
-- Extract the French and English arrays for the current sub_type
fr_values := input_json->sub_type_rec.type_en->'fr';
en_values := input_json->sub_type_rec.type_en->'en';
-- Ensure both arrays are of the same length
IF jsonb_array_length(fr_values) = jsonb_array_length(en_values) THEN
FOR i IN 0..(jsonb_array_length(fr_values) - 1)
LOOP
INSERT INTO sub_label (text_content_fr,text_content_en, label_id, edited, sub_type_id)
VALUES (
fr_values->>i,
en_values->>i,
label_id,
FALSE,
sub_type_id
);
END LOOP;
END IF;
END LOOP;
-- SUB_LABEL END

-- MICRO NUTRIENTS
-- Extract the French and English arrays for the current
fr_values := input_json->sub_type_rec.type_en->'fr';
en_values := input_json->sub_type_rec.type_en->'en';
-- Ensure both arrays are of the same length
--IF jsonb_array_length(fr_values) <> jsonb_array_length(en_values) THEN
-- RAISE EXCEPTION 'French and English micronutrient arrays must be of the same length';
FOR record IN SELECT * FROM jsonb_array_elements(en_values)
LOOP
INSERT INTO micronutrient (read_name, value, unit, edited, label_id,language)
VALUES (
record->> 'name',
(record->> 'value')::float,
record->> 'unit',
FALSE,
label_id,
'en':: public.language
);
END LOOP;
FOR record IN SELECT * FROM jsonb_array_elements(fr_values)
LOOP
INSERT INTO micronutrient (read_name, value, unit, edited, label_id,language)
VALUES (
record->> 'name',
(record->> 'value')::float,
record->> 'unit',
FALSE,
label_id,
'fr'::"nachet_0.0.9".language
);
END LOOP;
--MICRONUTRIENTS ENDS

-- GUARANTEED
FOR record IN SELECT * FROM jsonb_array_elements(input_json->'guaranteed_analysis')
LOOP
INSERT INTO micronutrient (read_name, value, unit, edited, label_id)
VALUES (
record->> 'name',
(record->> 'value')::float,
record->> 'unit',
FALSE,
label_id
);
END LOOP;
-- GUARANTEED END

-- INSPECTION
INSERT INTO inspection (
inspector_id, label_info_id, sample_id, picture_set_id
) VALUES (
user_id, -- Assuming inspector_id is handled separately
label_id,
NULL, -- NOT handled yet
picture_set_id -- Assuming picture_set_id is handled separately
)
RETURNING id INTO inspection_id;

-- Update input_json with company_id
input_json := jsonb_set(input_json, '{inspection_id}', to_jsonb(inspection_id));

RETURN input_json;

END;
$function$
Loading

0 comments on commit cb204a0

Please sign in to comment.