Jingga/oms-Comments
1
0
Fork 0
mirror of https://github.com/Karaka-Management/oms-Comments.git synced 2026-02-14 16:28:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

make id public, organigram impl. media password/encryption, settings bug fix, Money->FloatInt change, ...

Browse Source
This commit is contained in:
Dennis Eichhorn 2023-05-06 11:42:05 +00:00
parent 9b75c09cd6
commit b2dd5d3ed6
14 changed files with 45 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
Controller/ApiController.php
View File

@ -24,7 +24,6 @@ use Modules\Comments\Models\CommentListMapper;
use Modules\Comments\Models\CommentMapper; use Modules\Comments\Models\CommentMapper;
use Modules\Comments\Models\CommentVote; use Modules\Comments\Models\CommentVote;
use Modules\Comments\Models\CommentVoteMapper; use Modules\Comments\Models\CommentVoteMapper;
use Modules\Comments\Models\NullCommentVote;
use Modules\Media\Models\CollectionMapper; use Modules\Media\Models\CollectionMapper;
use Modules\Media\Models\MediaMapper; use Modules\Media\Models\MediaMapper;
use Modules\Media\Models\NullMedia; use Modules\Media\Models\NullMedia;
@ -191,22 +190,22 @@ final class ApiController extends Controller
foreach ($uploaded as $media) { foreach ($uploaded as $media) {
$this->createModelRelation( $this->createModelRelation(
$request->header->account, $request->header->account,
$comment->getId(), $comment->id,
$media->getId(), $media->id,
CommentMapper::class, CommentMapper::class,
'media', 'media',
'', '',
$request->getOrigin() $request->getOrigin()
); );
$accountPath = '/Accounts/' . $account->getId() . ' ' . $account->login $accountPath = '/Accounts/' . $account->id . ' ' . $account->login
. '/Comments/' . '/Comments/'
. $comment->createdAt->format('Y') . '/' . $comment->createdAt->format('m') . $comment->createdAt->format('Y') . '/' . $comment->createdAt->format('m')
. '/' . $comment->getId(); . '/' . $comment->id;
$ref = new Reference(); $ref = new Reference();
$ref->name = $media->name; $ref->name = $media->name;
$ref->source = new NullMedia($media->getId()); $ref->source = new NullMedia($media->id);
$ref->createdBy = new NullAccount($request->header->account); $ref->createdBy = new NullAccount($request->header->account);
$ref->setVirtualPath($accountPath); $ref->setVirtualPath($accountPath);
@ -216,14 +215,14 @@ final class ApiController extends Controller
$collection = $this->app->moduleManager->get('Media')->createRecursiveMediaCollection( $collection = $this->app->moduleManager->get('Media')->createRecursiveMediaCollection(
$accountPath, $accountPath,
$request->header->account, $request->header->account,
__DIR__ . '/../../../Modules/Media/Files/Accounts/' . $account->getId() . '/Comments/' . $comment->createdAt->format('Y') . '/' . $comment->createdAt->format('m') . '/' . $comment->getId() __DIR__ . '/../../../Modules/Media/Files/Accounts/' . $account->id . '/Comments/' . $comment->createdAt->format('Y') . '/' . $comment->createdAt->format('m') . '/' . $comment->id
); );
} }
$this->createModelRelation( $this->createModelRelation(
$request->header->account, $request->header->account,
$collection->getId(), $collection->id,
$ref->getId(), $ref->id,
CollectionMapper::class, CollectionMapper::class,
'sources', 'sources',
'', '',
@ -240,8 +239,8 @@ final class ApiController extends Controller
$media = MediaMapper::get()->where('id', (int) $file)->limit(1)->execute(); $media = MediaMapper::get()->where('id', (int) $file)->limit(1)->execute();
$this->createModelRelation( $this->createModelRelation(
$request->header->account, $request->header->account,
$comment->getId(), $comment->id,
$media->getId(), $media->id,
CommentMapper::class, CommentMapper::class,
'media', 'media',
'', '',
@ -250,7 +249,7 @@ final class ApiController extends Controller
$ref = new Reference(); $ref = new Reference();
$ref->name = $media->name; $ref->name = $media->name;
$ref->source = new NullMedia($media->getId()); $ref->source = new NullMedia($media->id);
$ref->createdBy = new NullAccount($request->header->account); $ref->createdBy = new NullAccount($request->header->account);
$ref->setVirtualPath($path); $ref->setVirtualPath($path);
@ -266,8 +265,8 @@ final class ApiController extends Controller
$this->createModelRelation( $this->createModelRelation(
$request->header->account, $request->header->account,
$collection->getId(), $collection->id,
$ref->getId(), $ref->id,
CollectionMapper::class, CollectionMapper::class,
'sources', 'sources',
'', '',
@ -292,7 +291,7 @@ final class ApiController extends Controller
. $comment->createdAt->format('Y') . '/' . $comment->createdAt->format('Y') . '/'
. $comment->createdAt->format('m') . '/' . $comment->createdAt->format('m') . '/'
. $comment->createdAt->format('d') . '/' . $comment->createdAt->format('d') . '/'
. $comment->getId(); . $comment->id;
} }
/** /**
@ -448,7 +447,7 @@ final class ApiController extends Controller
/** @var \Modules\Comments\Models\CommentVote $vote */ /** @var \Modules\Comments\Models\CommentVote $vote */
$vote = CommentVoteMapper::findVote((int) $request->getData('id'), $request->header->account); $vote = CommentVoteMapper::findVote((int) $request->getData('id'), $request->header->account);
if ($vote instanceof NullCommentVote) { if ($vote->id === 0) {
$new = new CommentVote(); $new = new CommentVote();
$new->score = (int) $request->getData('type'); $new->score = (int) $request->getData('type');
$new->comment = (int) $request->getData('id'); $new->comment = (int) $request->getData('id');

4
Models/Comment.php
View File

@ -34,7 +34,7 @@ class Comment implements \JsonSerializable
* @var int * @var int
* @since 1.0.0 * @since 1.0.0
*/ */
protected int $id = 0; public int $id = 0;
/** /**
* Account. * Account.
@ -74,7 +74,7 @@ class Comment implements \JsonSerializable
* @var int * @var int
* @since 1.0.0 * @since 1.0.0
*/ */
private int $status = CommentStatus::VISIBLE; public int $status = CommentStatus::VISIBLE;
/** /**
* Content * Content

2
Models/CommentList.php
View File

@ -30,7 +30,7 @@ class CommentList
* @var int * @var int
* @since 1.0.0 * @since 1.0.0
*/ */
protected int $id = 0; public int $id = 0;
/** /**
* Comments * Comments

2
Models/CommentVote.php
View File

@ -32,7 +32,7 @@ class CommentVote
* @var int * @var int
* @since 1.0.0 * @since 1.0.0
*/ */
protected int $id = 0; public int $id = 0;
/** /**
* Account. * Account.

4
Theme/Backend/Components/Comment/list.tpl.php
View File

@ -23,7 +23,7 @@ $comments = $this->commentList->getComments();
<div class="col-xs-12"> <div class="col-xs-12">
<section class="portlet"> <section class="portlet">
<div class="portlet-body"> <div class="portlet-body">
<form id="iComentListSettings" method="POST" action="<?= UriFactory::build('{/api}comment/list?id=' . $this->commentList->getId() . '{?}&csrf={$CSRF}'); ?>"> <form id="iComentListSettings" method="POST" action="<?= UriFactory::build('{/api}comment/list?id=' . $this->commentList->id . '{?}&csrf={$CSRF}'); ?>">
<div class="form-group"> <div class="form-group">
<div class="input-control"> <div class="input-control">
<select name="commentlist_status"> <select name="commentlist_status">
@ -73,7 +73,7 @@ foreach ($comments as $comment) : ?>
</div> </div>
<div class="portlet-foot"> <div class="portlet-foot">
<?php $files = $comment->getMedia(); foreach ($files as $file) : ?> <?php $files = $comment->getMedia(); foreach ($files as $file) : ?>
<span><a class="content" href="<?= UriFactory::build('{/base}/media/single?id=' . $file->getId());?>"><?= $file->name; ?></a></span> <span><a class="content" href="<?= UriFactory::build('{/base}/media/single?id=' . $file->id);?>"><?= $file->name; ?></a></span>
<?php endforeach; ?> <?php endforeach; ?>
<?= $this->printHtml($this->renderUserName('%3$s %2$s %1$s', [$comment->createdBy->name1, $comment->createdBy->name2, $comment->createdBy->name3, $comment->createdBy->login ?? ''])); ?> <?= $this->printHtml($this->renderUserName('%3$s %2$s %1$s', [$comment->createdBy->name1, $comment->createdBy->name2, $comment->createdBy->name3, $comment->createdBy->login ?? ''])); ?>

10
tests/Controller/ApiControllerTest.php
View File

@ -105,7 +105,7 @@ final class ApiControllerTest extends \PHPUnit\Framework\TestCase
$request->header->account = 1; $request->header->account = 1;
$this->module->apiCommentListCreate($request, $response); $this->module->apiCommentListCreate($request, $response);
self::assertGreaterThan(0, $lId = $response->get('')['response']->getId()); self::assertGreaterThan(0, $lId = $response->get('')['response']->id);
$response = new HttpResponse(); $response = new HttpResponse();
$request = new HttpRequest(new HttpUri('')); $request = new HttpRequest(new HttpUri(''));
@ -137,7 +137,7 @@ final class ApiControllerTest extends \PHPUnit\Framework\TestCase
$request->header->account = 1; $request->header->account = 1;
$this->module->apiCommentListCreate($request, $response); $this->module->apiCommentListCreate($request, $response);
self::assertGreaterThan(0, $lId = $response->get('')['response']->getId()); self::assertGreaterThan(0, $lId = $response->get('')['response']->id);
$response = new HttpResponse(); $response = new HttpResponse();
$request = new HttpRequest(new HttpUri('')); $request = new HttpRequest(new HttpUri(''));
@ -163,7 +163,7 @@ final class ApiControllerTest extends \PHPUnit\Framework\TestCase
$request->setData('media', \json_encode([1])); $request->setData('media', \json_encode([1]));
$this->module->apiCommentCreate($request, $response); $this->module->apiCommentCreate($request, $response);
self::assertGreaterThan(0, $cId = $response->get('')['response']->getId()); self::assertGreaterThan(0, $cId = $response->get('')['response']->id);
//read //read
$response = new HttpResponse(); $response = new HttpResponse();
@ -236,7 +236,7 @@ final class ApiControllerTest extends \PHPUnit\Framework\TestCase
$request->setData('type', '1'); $request->setData('type', '1');
$this->module->apiChangeCommentVote($request, $response); $this->module->apiChangeCommentVote($request, $response);
self::assertGreaterThan(0, $vId = $response->get('')['response']->getId()); self::assertGreaterThan(0, $vId = $response->get('')['response']->id);
$response = new HttpResponse(); $response = new HttpResponse();
$request = new HttpRequest(new HttpUri('')); $request = new HttpRequest(new HttpUri(''));
@ -246,6 +246,6 @@ final class ApiControllerTest extends \PHPUnit\Framework\TestCase
$request->setData('type', '-1'); $request->setData('type', '-1');
$this->module->apiChangeCommentVote($request, $response); $this->module->apiChangeCommentVote($request, $response);
self::assertEquals($vId, $response->get('')['response']->getId()); self::assertEquals($vId, $response->get('')['response']->id);
} }
} }

8
tests/Models/CommentListMapperTest.php
View File

@ -39,11 +39,11 @@ final class CommentListMapperTest extends \PHPUnit\Framework\TestCase
$list->addComment($comment); $list->addComment($comment);
$id = CommentListMapper::create()->execute($list); $id = CommentListMapper::create()->execute($list);
self::assertGreaterThan(0, $list->getId()); self::assertGreaterThan(0, $list->id);
self::assertEquals($id, $list->getId()); self::assertEquals($id, $list->id);
$listR = CommentListMapper::get()->with('comments')->where('id', $list->getId())->execute(); $listR = CommentListMapper::get()->with('comments')->where('id', $list->id)->execute();
self::assertEquals($id, $listR->getId()); self::assertEquals($id, $listR->id);
$actual = $listR->getComments(); $actual = $listR->getComments();
self::assertEquals($comment->title, \reset($actual)->title); self::assertEquals($comment->title, \reset($actual)->title);

2
tests/Models/CommentListTest.php
View File

@ -38,7 +38,7 @@ final class CommentListTest extends \PHPUnit\Framework\TestCase
*/ */
public function testDefault() : void public function testDefault() : void
{ {
self::assertEquals(0, $this->list->getId()); self::assertEquals(0, $this->list->id);
self::assertEquals([], $this->list->getComments()); self::assertEquals([], $this->list->getComments());
} }

12
tests/Models/CommentMapperTest.php
View File

@ -38,15 +38,15 @@ final class CommentMapperTest extends \PHPUnit\Framework\TestCase
$comment->list = new CommentList(); $comment->list = new CommentList();
$id = CommentMapper::create()->execute($comment); $id = CommentMapper::create()->execute($comment);
self::assertGreaterThan(0, $comment->getId()); self::assertGreaterThan(0, $comment->id);
self::assertEquals($id, $comment->getId()); self::assertEquals($id, $comment->id);
$commentR = CommentMapper::get()->where('id', $comment->getId())->execute(); $commentR = CommentMapper::get()->where('id', $comment->id)->execute();
self::assertEquals($id, $commentR->getId()); self::assertEquals($id, $commentR->id);
self::assertEquals($comment->createdBy->getId(), $commentR->createdBy->getId()); self::assertEquals($comment->createdBy->id, $commentR->createdBy->id);
self::assertEquals($comment->title, $commentR->title); self::assertEquals($comment->title, $commentR->title);
self::assertEquals($comment->content, $commentR->content); self::assertEquals($comment->content, $commentR->content);
self::assertEquals($comment->ref, $commentR->ref); self::assertEquals($comment->ref, $commentR->ref);
self::assertEquals($comment->list->getId(), $commentR->list->getId()); self::assertEquals($comment->list->id, $commentR->list->id);
} }
} }

8
tests/Models/CommentTest.php
View File

@ -41,11 +41,11 @@ final class CommentTest extends \PHPUnit\Framework\TestCase
*/ */
public function testDefault() : void public function testDefault() : void
{ {
self::assertEquals(0, $this->comment->getId()); self::assertEquals(0, $this->comment->id);
$date = new \DateTime('now'); $date = new \DateTime('now');
self::assertEquals($date->format('Y-m-d'), $this->comment->createdAt->format('Y-m-d')); self::assertEquals($date->format('Y-m-d'), $this->comment->createdAt->format('Y-m-d'));
self::assertEquals(0, $this->comment->createdBy->getId()); self::assertEquals(0, $this->comment->createdBy->id);
self::assertEquals(0, $this->comment->list); self::assertEquals(0, $this->comment->list);
self::assertEquals(0, $this->comment->ref); self::assertEquals(0, $this->comment->ref);
self::assertEquals('', $this->comment->title); self::assertEquals('', $this->comment->title);
@ -60,7 +60,7 @@ final class CommentTest extends \PHPUnit\Framework\TestCase
public function testCreatedByInputOutput() : void public function testCreatedByInputOutput() : void
{ {
$this->comment->createdBy = new NullAccount(1); $this->comment->createdBy = new NullAccount(1);
self::assertEquals(1, $this->comment->createdBy->getId()); self::assertEquals(1, $this->comment->createdBy->id);
} }
/** /**
@ -83,7 +83,7 @@ final class CommentTest extends \PHPUnit\Framework\TestCase
self::assertEquals(2, $this->comment->ref); self::assertEquals(2, $this->comment->ref);
$this->comment->ref = new NullComment(3); $this->comment->ref = new NullComment(3);
self::assertEquals(3, $this->comment->ref->getId()); self::assertEquals(3, $this->comment->ref->id);
} }
/** /**

2
tests/Models/CommentVoteTest.php
View File

@ -37,7 +37,7 @@ final class CommentVoteTest extends \PHPUnit\Framework\TestCase
*/ */
public function testDefault() : void public function testDefault() : void
{ {
self::assertEquals(0, $this->vote->getId()); self::assertEquals(0, $this->vote->id);
self::assertEquals(0, $this->vote->score); self::assertEquals(0, $this->vote->score);
self::assertEquals(0, $this->vote->comment); self::assertEquals(0, $this->vote->comment);
self::assertEquals(0, $this->vote->createdBy); self::assertEquals(0, $this->vote->createdBy);

2
tests/Models/NullCommentListTest.php
View File

@ -37,6 +37,6 @@ final class NullCommentListTest extends \PHPUnit\Framework\TestCase
public function testId() : void public function testId() : void
{ {
$null = new NullCommentList(2); $null = new NullCommentList(2);
self::assertEquals(2, $null->getId()); self::assertEquals(2, $null->id);
} }
} }

2
tests/Models/NullCommentTest.php
View File

@ -37,6 +37,6 @@ final class NullCommentTest extends \PHPUnit\Framework\TestCase
public function testId() : void public function testId() : void
{ {
$null = new NullComment(2); $null = new NullComment(2);
self::assertEquals(2, $null->getId()); self::assertEquals(2, $null->id);
} }
} }

2
tests/Models/NullCommentVoteTest.php
View File

@ -37,6 +37,6 @@ final class NullCommentVoteTest extends \PHPUnit\Framework\TestCase
public function testId() : void public function testId() : void
{ {
$null = new NullCommentVote(2); $null = new NullCommentVote(2);
self::assertEquals(2, $null->getId()); self::assertEquals(2, $null->id);
} }
} }