Skip to content

Commit

Permalink
enrollment function api changes added
Browse files Browse the repository at this point in the history
  • Loading branch information
@lahirulakruwan
lahirulakruwan committed Sep 29, 2024
1 parent a9e873f commit 319897b
Show file tree
Hide file tree
Showing 5 changed files with 274 additions and 14 deletions.
32 changes: 31 additions & 1 deletion api/Dependencies.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ dependencies = [
{org = "ballerina", name = "test"},
{org = "ballerina", name = "time"},
{org = "ballerinai", name = "observe"},
{org = "ballerinai", name = "transaction"},
{org = "ballerinax", name = "mysql"},
{org = "ballerinax", name = "mysql.driver"}
]
Expand Down Expand Up @@ -111,7 +112,7 @@ modules = [
[[package]]
org = "ballerina"
name = "http"
version = "2.10.15"
version = "2.10.16"
dependencies = [
{org = "ballerina", name = "auth"},
{org = "ballerina", name = "cache"},
Expand Down Expand Up @@ -242,6 +243,14 @@ dependencies = [
{org = "ballerina", name = "lang.regexp"}
]

[[package]]
org = "ballerina"
name = "lang.transaction"
version = "0.0.0"
dependencies = [
{org = "ballerina", name = "jballerina.java"}
]

[[package]]
org = "ballerina"
name = "lang.value"
Expand Down Expand Up @@ -402,6 +411,27 @@ modules = [
{org = "ballerinai", packageName = "observe", moduleName = "observe"}
]

[[package]]
org = "ballerinai"
name = "transaction"
version = "0.0.0"
dependencies = [
{org = "ballerina", name = "cache"},
{org = "ballerina", name = "http"},
{org = "ballerina", name = "io"},
{org = "ballerina", name = "jballerina.java"},
{org = "ballerina", name = "lang.runtime"},
{org = "ballerina", name = "lang.transaction"},
{org = "ballerina", name = "lang.value"},
{org = "ballerina", name = "log"},
{org = "ballerina", name = "task"},
{org = "ballerina", name = "time"},
{org = "ballerina", name = "uuid"}
]
modules = [
{org = "ballerinai", packageName = "transaction", moduleName = "transaction"}
]

[[package]]
org = "ballerinax"
name = "mysql"
Expand Down
9 changes: 8 additions & 1 deletion api/geo_data.bal
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,14 @@ public isolated service class ProvinceData {
public isolated service class DistrictData {
private District district;

isolated function init(string? name, int? district_id) returns error? {
isolated function init(string? name, int? district_id,District? district = null) returns error? {

if (district != null) {
self.district = district.cloneReadOnly();
return;
}


District district_raw = check db_client->queryRow(
`SELECT *
FROM district
Expand Down
231 changes: 220 additions & 11 deletions api/main.bal
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5495,13 +5495,12 @@ AND p.organization_id IN (
// return vehicleReasonDatas;
// }


isolated resource function get persons(int? organization_id,int? avinya_type_id) returns PersonData[]|error? {
isolated resource function get persons(int? organization_id, int? avinya_type_id) returns PersonData[]|error? {
stream<Person, error?> persons_data;

if(organization_id !=null && avinya_type_id !=null){
if (organization_id != null && avinya_type_id != null) {

lock {
lock {
persons_data = db_client->query(
`SELECT *
from person p
Expand All @@ -5512,35 +5511,245 @@ AND p.organization_id IN (
from parent_child_organization pco
where pco.parent_org_id = ${organization_id}
);`);
}

}

PersonData[] personDatas = [];

check from Person person_data_record in persons_data
do {
PersonData|error personData = new PersonData(null,0,person_data_record);
PersonData|error personData = new PersonData(null, 0, person_data_record);
if !(personData is error) {
personDatas.push(personData);
}
};

check persons_data.close();
return personDatas;
}else {
} else {
return error("Provide non-null values for both 'organization_id' and 'avinya_type_id'.");
}
}

}

isolated resource function get person_by_id(int? id) returns PersonData|error? {
if (id != null) {
return new (null,id);
return new (null, id);
} else {
return error("Provide non-null value for id.");
}
}


remote function update_person(Person person,Address? permanent_address,Address? mailing_address) returns PersonData|error? {

//starting the transaction
boolean first_db_transaction_fail = false;
boolean second_db_transaction_fail = false;
boolean third_db_transaction_fail = false;

sql:ExecutionResult permanent_address_res;
sql:ExecutionResult mailing_address_res;

int|string? permanent_address_insert_id=null;
int|string? mailing_address_insert_id=null;

transaction {

int permanent_address_id = permanent_address?.id ?: 0;

Address|error? permanent_address_raw = db_client->queryRow(
`SELECT *
FROM address
WHERE id = ${permanent_address_id};`
);

if (permanent_address_raw is Address) {
io:println("Permanent Address is already exists!");

permanent_address_res = check db_client->execute(
`UPDATE address SET
street_address = ${permanent_address?.street_address},
phone = ${permanent_address?.phone},
city_id = ${permanent_address?.city_id}
WHERE id = ${permanent_address_id};`);

permanent_address_insert_id = permanent_address_id;

if (permanent_address_res.affectedRowCount == sql:EXECUTION_FAILED){
first_db_transaction_fail = true;
io:println("Unable to update permanent address record");
}

}else{

permanent_address_res = check db_client->execute(
`INSERT INTO address(
street_address,
phone,
city_id
) VALUES(
${permanent_address?.street_address},
${permanent_address?.phone},
${permanent_address?.city_id}
);`
);

permanent_address_insert_id = permanent_address_res.lastInsertId;

if !(permanent_address_insert_id is int) {
first_db_transaction_fail = true;
io:println("Unable to insert permanent address");
}
}

int mailing_address_id = mailing_address?.id ?: 0;

Address|error? mailing_address_raw = db_client->queryRow(
`SELECT *
FROM address
WHERE id = ${mailing_address_id};`
);

if (mailing_address_raw is Address) {

io:println("Mailing Address is already exists!");

mailing_address_res = check db_client->execute(
`UPDATE address SET
street_address = ${mailing_address?.street_address},
phone = ${mailing_address?.phone},
city_id = ${mailing_address?.city_id}
WHERE id = ${mailing_address_id};`);

mailing_address_insert_id = mailing_address_id;

if (mailing_address_res.affectedRowCount == sql:EXECUTION_FAILED){
second_db_transaction_fail = true;
io:println("Unable to update mailing address record");
}

}else{

mailing_address_res = check db_client->execute(
`INSERT INTO address(
street_address,
phone,
city_id
) VALUES(
${mailing_address?.street_address},
${mailing_address?.phone},
${mailing_address?.city_id}
);`
);

mailing_address_insert_id = mailing_address_res.lastInsertId;

if !(mailing_address_insert_id is int) {
second_db_transaction_fail = true;
io:println("Unable to insert mailing address");
}

}

int person_id = person.id ?: 0;

sql:ExecutionResult update_person_res = check db_client->execute(
`UPDATE person SET
preferred_name = ${person.preferred_name},
full_name = ${person.full_name},
date_of_birth = ${person.date_of_birth},
sex = ${person.sex},
asgardeo_id = ${person.asgardeo_id},
jwt_sub_id = ${person.jwt_sub_id},
jwt_email = ${person.jwt_email},
permanent_address_id = ${permanent_address_insert_id},
mailing_address_id = ${mailing_address_insert_id},
phone = ${person.phone},
organization_id = ${person.organization_id},
avinya_type_id = ${person.avinya_type_id},
notes = ${person.notes},
nic_no = ${person.nic_no},
passport_no = ${person.passport_no},
id_no = ${person.id_no},
email = ${person.email},
street_address = ${person.street_address},
digital_id = ${person.digital_id},
avinya_phone = ${person.avinya_phone},
bank_name = ${person.bank_name},
bank_account_number = ${person.bank_account_number},
bank_account_name = ${person.bank_account_name},
academy_org_id = ${person.academy_org_id},
bank_branch = ${person.bank_branch},
updated_by = ${person.updated_by}
WHERE id = ${person_id};`);

if (update_person_res.affectedRowCount == sql:EXECUTION_FAILED){
third_db_transaction_fail = true;
io:println("Unable to update person record");
}

if (first_db_transaction_fail ||
second_db_transaction_fail ||
third_db_transaction_fail) {

rollback;
return error("Transaction rollback successfully!");
}else{

// Commit the transaction if three updates are successful
check commit;
io:println("Transaction committed successfully!");
return new (null,person_id);
}
}

}

isolated resource function get districts() returns DistrictData[]|error? {
stream<District, error?> districts_data;

lock {
districts_data = db_client->query(
`SELECT *
from district;`);
}

DistrictData[] districtDatas = [];

check from District district_data_record in districts_data
do {
DistrictData|error districtData = new DistrictData(null,0,district_data_record);
if !(districtData is error) {
districtDatas.push(districtData);
}
};

check districts_data.close();
return districtDatas;
}

isolated resource function get all_organizations() returns OrganizationData[]|error? {
stream<Organization, error?> organizations_data;

lock {
organizations_data = db_client->query(
`SELECT *
from organization;`);
}

OrganizationData[] organizationDatas = [];

check from Organization organization_data_record in organizations_data
do {
OrganizationData|error organizationData = new OrganizationData(null,0,organization_data_record);
if !(organizationData is error) {
organizationDatas.push(organizationData);
}
};

check organizations_data.close();
return organizationDatas;
}

}

isolated function calculateWeekdays(time:Utc toDate, time:Utc fromDate) returns int {
Expand Down
12 changes: 12 additions & 0 deletions api/person_data.bal
View file
Original file line number Diff line number Diff line change
Expand Up @@ -289,4 +289,16 @@ public isolated service class PersonData {
}
}

isolated resource function get created_by() returns int? {
lock {
return self.person.created_by;
}
}

isolated resource function get updated_by() returns int? {
lock {
return self.person.updated_by;
}
}

}
4 changes: 3 additions & 1 deletion api/types.bal
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ public type City record {|
public type Address record {
readonly string? record_type = "address";
int id?;
*LocalizedName;
//*LocalizedName;
string street_address;
int? phone;
int city_id;
Expand Down Expand Up @@ -129,6 +129,8 @@ public type Person record {|
int? academy_org_id;
string? academy_org_name;
string? branch_code;
int? created_by;
int? updated_by;
|};

type ParentChildStudent record {|
Expand Down

0 comments on commit 319897b

Please sign in to comment.