mirror of
https://github.com/Karaka-Management/oms-InvestmentManagement.git
synced 2026-01-11 11:48:41 +00:00
update
This commit is contained in:
parent
da200dacf6
commit
84f132196f
|
|
@ -123,8 +123,10 @@ final class ApiController extends Controller
|
||||||
{
|
{
|
||||||
$path = $this->createInvestmentDir($investment);
|
$path = $this->createInvestmentDir($investment);
|
||||||
|
|
||||||
|
$collection = null;
|
||||||
|
|
||||||
if (!empty($uploadedFiles = $request->files)) {
|
if (!empty($uploadedFiles = $request->files)) {
|
||||||
$uploaded = $this->app->moduleManager->get('Media')->uploadFiles(
|
$uploaded = $this->app->moduleManager->get('Media', 'Api')->uploadFiles(
|
||||||
names: [],
|
names: [],
|
||||||
fileNames: [],
|
fileNames: [],
|
||||||
files: $uploadedFiles,
|
files: $uploadedFiles,
|
||||||
|
|
@ -134,7 +136,6 @@ final class ApiController extends Controller
|
||||||
pathSettings: PathSettings::FILE_PATH
|
pathSettings: PathSettings::FILE_PATH
|
||||||
);
|
);
|
||||||
|
|
||||||
$collection = null;
|
|
||||||
foreach ($uploaded as $media) {
|
foreach ($uploaded as $media) {
|
||||||
$this->createModelRelation(
|
$this->createModelRelation(
|
||||||
$request->header->account,
|
$request->header->account,
|
||||||
|
|
@ -171,54 +172,51 @@ final class ApiController extends Controller
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!empty($mediaFiles = $request->getDataJson('media'))) {
|
$mediaFiles = $request->getDataJson('media');
|
||||||
$collection = null;
|
foreach ($mediaFiles as $file) {
|
||||||
|
/** @var \Modules\Media\Models\Media $media */
|
||||||
|
$media = MediaMapper::get()->where('id', (int) $file)->limit(1)->execute();
|
||||||
|
|
||||||
foreach ($mediaFiles as $file) {
|
$this->createModelRelation(
|
||||||
/** @var \Modules\Media\Models\Media $media */
|
$request->header->account,
|
||||||
$media = MediaMapper::get()->where('id', (int) $file)->limit(1)->execute();
|
$investment->id,
|
||||||
|
$media->id,
|
||||||
|
InvestmentMapper::class,
|
||||||
|
'files',
|
||||||
|
'',
|
||||||
|
$request->getOrigin()
|
||||||
|
);
|
||||||
|
|
||||||
$this->createModelRelation(
|
$ref = new Reference();
|
||||||
$request->header->account,
|
$ref->name = $media->name;
|
||||||
$investment->id,
|
$ref->source = new NullMedia($media->id);
|
||||||
$media->id,
|
$ref->createdBy = new NullAccount($request->header->account);
|
||||||
InvestmentMapper::class,
|
$ref->setVirtualPath($path);
|
||||||
'files',
|
|
||||||
'',
|
|
||||||
$request->getOrigin()
|
|
||||||
);
|
|
||||||
|
|
||||||
$ref = new Reference();
|
$this->createModel($request->header->account, $ref, ReferenceMapper::class, 'media_reference', $request->getOrigin());
|
||||||
$ref->name = $media->name;
|
|
||||||
$ref->source = new NullMedia($media->id);
|
|
||||||
$ref->createdBy = new NullAccount($request->header->account);
|
|
||||||
$ref->setVirtualPath($path);
|
|
||||||
|
|
||||||
$this->createModel($request->header->account, $ref, ReferenceMapper::class, 'media_reference', $request->getOrigin());
|
if ($collection === null) {
|
||||||
|
/** @var \Modules\Media\Models\Collection $collection */
|
||||||
|
$collection = MediaMapper::getParentCollection($path)->limit(1)->execute();
|
||||||
|
|
||||||
if ($collection === null) {
|
if ($collection->id === 0) {
|
||||||
/** @var \Modules\Media\Models\Collection $collection */
|
$collection = $this->app->moduleManager->get('Media')->createRecursiveMediaCollection(
|
||||||
$collection = MediaMapper::getParentCollection($path)->limit(1)->execute();
|
$path,
|
||||||
|
$request->header->account,
|
||||||
if ($collection->id === 0) {
|
__DIR__ . '/../../../Modules/Media/Files' . $path
|
||||||
$collection = $this->app->moduleManager->get('Media')->createRecursiveMediaCollection(
|
);
|
||||||
$path,
|
|
||||||
$request->header->account,
|
|
||||||
__DIR__ . '/../../../Modules/Media/Files' . $path
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
$this->createModelRelation(
|
|
||||||
$request->header->account,
|
|
||||||
$collection->id,
|
|
||||||
$ref->id,
|
|
||||||
CollectionMapper::class,
|
|
||||||
'sources',
|
|
||||||
'',
|
|
||||||
$request->getOrigin()
|
|
||||||
);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
$this->createModelRelation(
|
||||||
|
$request->header->account,
|
||||||
|
$collection->id,
|
||||||
|
$ref->id,
|
||||||
|
CollectionMapper::class,
|
||||||
|
'sources',
|
||||||
|
'',
|
||||||
|
$request->getOrigin()
|
||||||
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -250,7 +248,7 @@ final class ApiController extends Controller
|
||||||
|
|
||||||
$uploaded = [];
|
$uploaded = [];
|
||||||
if (!empty($uploadedFiles = $request->files)) {
|
if (!empty($uploadedFiles = $request->files)) {
|
||||||
$uploaded = $this->app->moduleManager->get('Media')->uploadFiles(
|
$uploaded = $this->app->moduleManager->get('Media', 'Api')->uploadFiles(
|
||||||
names: [],
|
names: [],
|
||||||
fileNames: [],
|
fileNames: [],
|
||||||
files: $uploadedFiles,
|
files: $uploadedFiles,
|
||||||
|
|
@ -311,18 +309,17 @@ final class ApiController extends Controller
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!empty($mediaFiles = $request->getDataJson('media'))) {
|
$mediaFiles = $request->getDataJson('media');
|
||||||
foreach ($mediaFiles as $media) {
|
foreach ($mediaFiles as $media) {
|
||||||
$this->createModelRelation(
|
$this->createModelRelation(
|
||||||
$request->header->account,
|
$request->header->account,
|
||||||
$investment->id,
|
$investment->id,
|
||||||
(int) $media,
|
(int) $media,
|
||||||
InvestmentMapper::class,
|
InvestmentMapper::class,
|
||||||
'files',
|
'files',
|
||||||
'',
|
'',
|
||||||
$request->getOrigin()
|
$request->getOrigin()
|
||||||
);
|
);
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
$this->fillJsonResponse($request, $response, NotificationLevel::OK, 'Media', 'Media added to investment.', [
|
$this->fillJsonResponse($request, $response, NotificationLevel::OK, 'Media', 'Media added to investment.', [
|
||||||
|
|
@ -572,8 +569,10 @@ final class ApiController extends Controller
|
||||||
{
|
{
|
||||||
$path = $this->createInvestmentObjectDir($investment);
|
$path = $this->createInvestmentObjectDir($investment);
|
||||||
|
|
||||||
|
$collection = null;
|
||||||
|
|
||||||
if (!empty($uploadedFiles = $request->files)) {
|
if (!empty($uploadedFiles = $request->files)) {
|
||||||
$uploaded = $this->app->moduleManager->get('Media')->uploadFiles(
|
$uploaded = $this->app->moduleManager->get('Media', 'Api')->uploadFiles(
|
||||||
names: [],
|
names: [],
|
||||||
fileNames: [],
|
fileNames: [],
|
||||||
files: $uploadedFiles,
|
files: $uploadedFiles,
|
||||||
|
|
@ -583,7 +582,7 @@ final class ApiController extends Controller
|
||||||
pathSettings: PathSettings::FILE_PATH
|
pathSettings: PathSettings::FILE_PATH
|
||||||
);
|
);
|
||||||
|
|
||||||
$collection = null;
|
|
||||||
foreach ($uploaded as $media) {
|
foreach ($uploaded as $media) {
|
||||||
$this->createModelRelation(
|
$this->createModelRelation(
|
||||||
$request->header->account,
|
$request->header->account,
|
||||||
|
|
@ -620,54 +619,51 @@ final class ApiController extends Controller
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!empty($mediaFiles = $request->getDataJson('media'))) {
|
$mediaFiles = $request->getDataJson('media');
|
||||||
$collection = null;
|
foreach ($mediaFiles as $file) {
|
||||||
|
/** @var \Modules\Media\Models\Media $media */
|
||||||
|
$media = MediaMapper::get()->where('id', (int) $file)->limit(1)->execute();
|
||||||
|
|
||||||
foreach ($mediaFiles as $file) {
|
$this->createModelRelation(
|
||||||
/** @var \Modules\Media\Models\Media $media */
|
$request->header->account,
|
||||||
$media = MediaMapper::get()->where('id', (int) $file)->limit(1)->execute();
|
$investment->id,
|
||||||
|
$media->id,
|
||||||
|
InvestmentObjectMapper::class,
|
||||||
|
'files',
|
||||||
|
'',
|
||||||
|
$request->getOrigin()
|
||||||
|
);
|
||||||
|
|
||||||
$this->createModelRelation(
|
$ref = new Reference();
|
||||||
$request->header->account,
|
$ref->name = $media->name;
|
||||||
$investment->id,
|
$ref->source = new NullMedia($media->id);
|
||||||
$media->id,
|
$ref->createdBy = new NullAccount($request->header->account);
|
||||||
InvestmentObjectMapper::class,
|
$ref->setVirtualPath($path);
|
||||||
'files',
|
|
||||||
'',
|
|
||||||
$request->getOrigin()
|
|
||||||
);
|
|
||||||
|
|
||||||
$ref = new Reference();
|
$this->createModel($request->header->account, $ref, ReferenceMapper::class, 'media_reference', $request->getOrigin());
|
||||||
$ref->name = $media->name;
|
|
||||||
$ref->source = new NullMedia($media->id);
|
|
||||||
$ref->createdBy = new NullAccount($request->header->account);
|
|
||||||
$ref->setVirtualPath($path);
|
|
||||||
|
|
||||||
$this->createModel($request->header->account, $ref, ReferenceMapper::class, 'media_reference', $request->getOrigin());
|
if ($collection === null) {
|
||||||
|
/** @var \Modules\Media\Models\Collection $collection */
|
||||||
|
$collection = MediaMapper::getParentCollection($path)->limit(1)->execute();
|
||||||
|
|
||||||
if ($collection === null) {
|
if ($collection->id === 0) {
|
||||||
/** @var \Modules\Media\Models\Collection $collection */
|
$collection = $this->app->moduleManager->get('Media')->createRecursiveMediaCollection(
|
||||||
$collection = MediaMapper::getParentCollection($path)->limit(1)->execute();
|
$path,
|
||||||
|
$request->header->account,
|
||||||
if ($collection->id === 0) {
|
__DIR__ . '/../../../Modules/Media/Files' . $path
|
||||||
$collection = $this->app->moduleManager->get('Media')->createRecursiveMediaCollection(
|
);
|
||||||
$path,
|
|
||||||
$request->header->account,
|
|
||||||
__DIR__ . '/../../../Modules/Media/Files' . $path
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
$this->createModelRelation(
|
|
||||||
$request->header->account,
|
|
||||||
$collection->id,
|
|
||||||
$ref->id,
|
|
||||||
CollectionMapper::class,
|
|
||||||
'sources',
|
|
||||||
'',
|
|
||||||
$request->getOrigin()
|
|
||||||
);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
$this->createModelRelation(
|
||||||
|
$request->header->account,
|
||||||
|
$collection->id,
|
||||||
|
$ref->id,
|
||||||
|
CollectionMapper::class,
|
||||||
|
'sources',
|
||||||
|
'',
|
||||||
|
$request->getOrigin()
|
||||||
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -699,7 +695,7 @@ final class ApiController extends Controller
|
||||||
|
|
||||||
$uploaded = [];
|
$uploaded = [];
|
||||||
if (!empty($uploadedFiles = $request->files)) {
|
if (!empty($uploadedFiles = $request->files)) {
|
||||||
$uploaded = $this->app->moduleManager->get('Media')->uploadFiles(
|
$uploaded = $this->app->moduleManager->get('Media', 'Api')->uploadFiles(
|
||||||
names: [],
|
names: [],
|
||||||
fileNames: [],
|
fileNames: [],
|
||||||
files: $uploadedFiles,
|
files: $uploadedFiles,
|
||||||
|
|
@ -760,18 +756,17 @@ final class ApiController extends Controller
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!empty($mediaFiles = $request->getDataJson('media'))) {
|
$mediaFiles = $request->getDataJson('media');
|
||||||
foreach ($mediaFiles as $media) {
|
foreach ($mediaFiles as $media) {
|
||||||
$this->createModelRelation(
|
$this->createModelRelation(
|
||||||
$request->header->account,
|
$request->header->account,
|
||||||
$investment->id,
|
$investment->id,
|
||||||
(int) $media,
|
(int) $media,
|
||||||
InvestmentObjectMapper::class,
|
InvestmentObjectMapper::class,
|
||||||
'files',
|
'files',
|
||||||
'',
|
'',
|
||||||
$request->getOrigin()
|
$request->getOrigin()
|
||||||
);
|
);
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
$this->fillJsonResponse($request, $response, NotificationLevel::OK, 'Media', 'Media added to investment.', [
|
$this->fillJsonResponse($request, $response, NotificationLevel::OK, 'Media', 'Media added to investment.', [
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user