Skip to content
Snippets Groups Projects
Verified Commit 65ca7732 authored by Damien's avatar Damien
Browse files

FEAT #7731 Return id after creation

parent bc527075
No related branches found
No related tags found
No related merge requests found
...@@ -37,5 +37,6 @@ ALTER TABLE docservers DROP COLUMN IF EXISTS closing_date; ...@@ -37,5 +37,6 @@ ALTER TABLE docservers DROP COLUMN IF EXISTS closing_date;
ALTER TABLE docservers DROP COLUMN IF EXISTS enabled; ALTER TABLE docservers DROP COLUMN IF EXISTS enabled;
ALTER TABLE docservers DROP COLUMN IF EXISTS id; ALTER TABLE docservers DROP COLUMN IF EXISTS id;
ALTER TABLE docservers ADD COLUMN id serial; ALTER TABLE docservers ADD COLUMN id serial;
ALTER TABLE docservers ADD UNIQUE (id);
DROP TABLE IF EXISTS docserver_locations; DROP TABLE IF EXISTS docserver_locations;
...@@ -73,7 +73,8 @@ CREATE TABLE docservers ...@@ -73,7 +73,8 @@ CREATE TABLE docservers
coll_id character varying(32) NOT NULL DEFAULT 'coll_1'::character varying, coll_id character varying(32) NOT NULL DEFAULT 'coll_1'::character varying,
priority_number integer NOT NULL DEFAULT 10, priority_number integer NOT NULL DEFAULT 10,
adr_priority_number integer NOT NULL DEFAULT 1, adr_priority_number integer NOT NULL DEFAULT 1,
CONSTRAINT docservers_pkey PRIMARY KEY (docserver_id) CONSTRAINT docservers_pkey PRIMARY KEY (docserver_id),
CONSTRAINT docservers_id_key UNIQUE (id)
) )
WITH (OIDS=FALSE); WITH (OIDS=FALSE);
......
...@@ -42,6 +42,11 @@ class DocserverController ...@@ -42,6 +42,11 @@ class DocserverController
} else { } else {
$docserver['actualSizeFormatted'] = round($docserver['actual_size_number'] / 1000000, 3) . ' Mo'; $docserver['actualSizeFormatted'] = round($docserver['actual_size_number'] / 1000000, 3) . ' Mo';
} }
if ($docserver['size_limit_number'] > 1000000000) {
$docserver['limitSizeFormatted'] = round($docserver['size_limit_number'] / 1000000000, 3) . ' Go';
} else {
$docserver['limitSizeFormatted'] = round($docserver['size_limit_number'] / 1000000, 3) . ' Mo';
}
$docserver['percentage'] = round($docserver['actual_size_number'] / $docserver['size_limit_number'] * 100, 2); $docserver['percentage'] = round($docserver['actual_size_number'] / $docserver['size_limit_number'] * 100, 2);
$sortedDocservers[$docserver['docserver_type_id']][] = $docserver; $sortedDocservers[$docserver['docserver_type_id']][] = $docserver;
$types[] = $docserver['docserver_type_id']; $types[] = $docserver['docserver_type_id'];
...@@ -94,7 +99,7 @@ class DocserverController ...@@ -94,7 +99,7 @@ class DocserverController
$data['is_readonly'] = empty($data['is_readonly']) ? 'N' : 'Y'; $data['is_readonly'] = empty($data['is_readonly']) ? 'N' : 'Y';
DocserverModel::create($data); $id = DocserverModel::create($data);
HistoryController::add([ HistoryController::add([
'tableName' => 'docservers', 'tableName' => 'docservers',
'recordId' => $data['docserver_id'], 'recordId' => $data['docserver_id'],
...@@ -104,7 +109,7 @@ class DocserverController ...@@ -104,7 +109,7 @@ class DocserverController
'eventId' => 'docserverCreation', 'eventId' => 'docserverCreation',
]); ]);
return $response->withJson(['docserver' => $data['docserver_id']]); return $response->withJson(['docserver' => $id]);
} }
public function update(Request $request, Response $response, array $aArgs) public function update(Request $request, Response $response, array $aArgs)
......
...@@ -122,9 +122,12 @@ class DocserverModelAbstract ...@@ -122,9 +122,12 @@ class DocserverModelAbstract
ValidatorModel::stringType($aArgs, ['docserver_id', 'docserver_type_id', 'device_label', 'path_template', 'coll_id', 'is_readonly']); ValidatorModel::stringType($aArgs, ['docserver_id', 'docserver_type_id', 'device_label', 'path_template', 'coll_id', 'is_readonly']);
ValidatorModel::intVal($aArgs, ['size_limit_number', 'priority_number', 'adr_priority_number']); ValidatorModel::intVal($aArgs, ['size_limit_number', 'priority_number', 'adr_priority_number']);
$nextSequenceId = DatabaseModel::getNextSequenceValue(['sequenceId' => 'docservers_id_seq']);
DatabaseModel::insert([ DatabaseModel::insert([
'table' => 'docservers', 'table' => 'docservers',
'columnsValues' => [ 'columnsValues' => [
'id' => $nextSequenceId,
'docserver_id' => $aArgs['docserver_id'], 'docserver_id' => $aArgs['docserver_id'],
'docserver_type_id' => $aArgs['docserver_type_id'], 'docserver_type_id' => $aArgs['docserver_type_id'],
'device_label' => $aArgs['device_label'], 'device_label' => $aArgs['device_label'],
...@@ -138,7 +141,7 @@ class DocserverModelAbstract ...@@ -138,7 +141,7 @@ class DocserverModelAbstract
] ]
]); ]);
return true; return $nextSequenceId;
} }
public static function update(array $aArgs) public static function update(array $aArgs)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment