openinfra
/
openstackid-resources
Code Issues Proposed changes

Updated AdminPresentationCSVSerializer 

added following fields

* submitter_id
* submitter_full_name
* submitter_email
* submitter_title
* submitter_company

Change-Id: I8d277a4052b7eccd0f83df4a88b6fa0017276435
Signed-off-by: smarcet <smarcet@gmail.com>
This commit is contained in:
smarcet 2021-07-13 18:00:11 -03:00
parent 91ffe46586
commit 08d4973336
2 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
app/ModelSerializers/Summit/Presentation/AdminPresentationCSVSerializer.php
View File

@ -89,6 +89,26 @@ final class AdminPresentationCSVSerializer extends AdminPresentationSerializer
$values['speaker_companies'] = implode("|", $speaker_companies);
}
// submitter
$values['submitter_id'] = "";
$values['submitter_full_name'] = "";
$values['submitter_email'] = "";
$values['submitter_title'] = "";
$values['submitter_company'] = "";
if($presentation->hasCreatedBy()){
$creator = $presentation->getCreatedBy();
if($creator->hasSpeaker()){
$submitter = $creator->getSpeaker();
$values['submitter_id'] = $submitter->getId();
$values['submitter_full_name'] = $submitter->getFullName();
$values['submitter_email'] = $submitter->getEmail();
$values['submitter_title'] = $submitter->getTitle();
$values['submitter_company'] = $submitter->getCompany();
}
}
if(isset($values['description'])){
$values['description'] = strip_tags($values['description']);
}

4
app/Services/Utils/DoctrineTransactionService.php
View File

@ -47,7 +47,7 @@ final class DoctrineTransactionService implements ITransactionService
* @param Closure $callback
* @param int $isolationLevel
* @return mixed
*
* @see lib/Doctrine/ORM/EntityManager.php
* @throws \Exception
*/
public function transaction(Closure $callback, int $isolationLevel = TransactionIsolationLevel::READ_COMMITTED)
@ -100,8 +100,8 @@ final class DoctrineTransactionService implements ITransactionService
} catch (Exception $ex) {
Log::warning("rolling back transaction");
Log::warning($ex);
$con->rollBack();
$em->close();
$con->rollBack();
throw $ex;
}
}