Правки по стилю кода

otusteamedu · Sep 3, 2023 · 4797251 · 4797251
1 parent 69aa25f
commit 4797251
Show file tree

Hide file tree

Showing 32 changed files with 78 additions and 177 deletions.
diff --git a/code/public/import.php b/code/public/import.php
@@ -12,7 +12,6 @@
 use VKorabelnikov\Hw16\MusicStreaming\Infrastructure\Storage\DataMapper\PlaylistMapper;
 use VKorabelnikov\Hw16\MusicStreaming\Infrastructure\Config\IniConfig;
 use VKorabelnikov\Hw16\MusicStreaming\Infrastructure\Storage\ConnectionManager;
-
 use VKorabelnikov\Hw16\MusicStreaming\Infrastructure\HttpApiController\PlaylistController;
 use VKorabelnikov\Hw16\MusicStreaming\Infrastructure\HttpApiController\UserController;
 use VKorabelnikov\Hw16\MusicStreaming\Infrastructure\HttpApiController\TrackController;
@@ -195,6 +194,3 @@
         "userLogin" => $user2Login
     ]
 );
-
-
-
diff --git a/code/public/v1/index.php b/code/public/v1/index.php
@@ -1,4 +1,5 @@
 <?php
+
 require __DIR__ . "/../../vendor/autoload.php";
 
 use VKorabelnikov\Hw16\MusicStreaming\Infrastructure\Init\HttpApiInit;

diff --git a/code/src/MusicStreaming/Application/Config/ConfigInterface.php b/code/src/MusicStreaming/Application/Config/ConfigInterface.php
@@ -9,4 +9,4 @@
 interface ConfigInterface
 {
     public function getAllSettings(): Config;
-}
+}
diff --git a/code/src/MusicStreaming/Application/DTO/Config.php b/code/src/MusicStreaming/Application/DTO/Config.php
@@ -12,4 +12,4 @@ class Config
     public ?string $connectionDbName;
     public ?string $connectionDbUser;
     public ?string $connectionDbPassword;
-}
+}
diff --git a/code/src/MusicStreaming/Application/DataTransfer/EntityListResponse.php b/code/src/MusicStreaming/Application/DataTransfer/EntityListResponse.php
@@ -4,7 +4,7 @@
 
 namespace VKorabelnikov\Hw16\MusicStreaming\Application\DataTransfer;
 
-use function \VKorabelnikov\Hw16\MusicStreaming\Domain\Model\Functions\convertFromIntToString;
+use function VKorabelnikov\Hw16\MusicStreaming\Domain\Model\Functions\convertFromIntToString;
 
 class EntityListResponse extends Response
 {
@@ -31,7 +31,7 @@ public function getEntitiesList(): array
     private function computeDuration(array $entitiesList): string
     {
         $totalDuration = 0;
-        foreach($entitiesList as $entity) {
+        foreach ($entitiesList as $entity) {
             $totalDuration += $entity->getDurationSeconds();
         }
         return convertFromIntToString($totalDuration);

diff --git a/code/src/MusicStreaming/Application/DataTransfer/ErrorResponse.php b/code/src/MusicStreaming/Application/DataTransfer/ErrorResponse.php
@@ -8,7 +8,8 @@ class ErrorResponse extends Response
 {
     protected string $errorDescription;
 
-    public function __construct($errorDescription) {
+    public function __construct($errorDescription)
+    {
         $this->success = false;
         $this->errorDescription = $errorDescription;
     }

diff --git a/code/src/MusicStreaming/Application/Exceptions/TableRowNotFoundException.php b/code/src/MusicStreaming/Application/Exceptions/TableRowNotFoundException.php
@@ -4,8 +4,7 @@
 
 namespace VKorabelnikov\Hw16\MusicStreaming\Application\Exceptions;
 
-
 class TableRowNotFoundException extends \Exception
 {
 
-}
+}
diff --git a/code/src/MusicStreaming/Application/Storage/DataMapper/TrackMapperInterface.php b/code/src/MusicStreaming/Application/Storage/DataMapper/TrackMapperInterface.php
@@ -14,4 +14,4 @@ public function findByGenre(Genre $genre, $limit, $offset): array;
     public function insert(Track $track): void;
     public function update(Track $track): bool;
     public function delete(Track $track): bool;
-}
+}
diff --git a/code/src/MusicStreaming/Application/UseCase/CreatePlaylistUsecase.php b/code/src/MusicStreaming/Application/UseCase/CreatePlaylistUsecase.php
@@ -19,8 +19,7 @@ public function __construct(
         PlaylistMapperInterface $playlistMapper,
         UserMapperInterface $userMapper,
         TrackMapperInterface $trackMapper
-    )
-    {
+    ) {
         $this->playlistMapper = $playlistMapper;
         $this->userMapper = $userMapper;
         $this->trackMapper = $trackMapper;
@@ -36,7 +35,7 @@ public function create(array $playlistParams)
 
         if (
             empty($playlistParams["tracksList"])
-            || !is_array($playlistParams["tracksList"])    
+            || !is_array($playlistParams["tracksList"])
         ) {
             throw new \Exception("Incorrect tracksList");
         }
@@ -52,7 +51,7 @@ public function create(array $playlistParams)
     public function createPaylistObject($playlistParams): Playlist
     {
         $tracksList = [];
-        foreach($playlistParams["tracksList"] as $trackId){
+        foreach ($playlistParams["tracksList"] as $trackId) {
             $tracksList[] = $this->trackMapper->findById((int) $trackId);
         }
 

diff --git a/code/src/MusicStreaming/Application/UseCase/FindPlaylistUseCase.php b/code/src/MusicStreaming/Application/UseCase/FindPlaylistUseCase.php
@@ -15,8 +15,7 @@ class FindPlaylistUseCase
     public function __construct(
         PlaylistMapperInterface $playlistMapper,
         UserMapperInterface $userMapper
-    )
-    {
+    ) {
         $this->playlistMapper = $playlistMapper;
         $this->userMapper = $userMapper;
     }

diff --git a/code/src/MusicStreaming/Application/UseCase/FindTrackUseCase.php b/code/src/MusicStreaming/Application/UseCase/FindTrackUseCase.php
@@ -10,7 +10,6 @@
 use VKorabelnikov\Hw16\MusicStreaming\Domain\Model\TrackWithSocialLinksInDescription;
 use VKorabelnikov\Hw16\MusicStreaming\Domain\Model\TrackWithDurationInDescription;
 
-
 class FindTrackUseCase
 {
     protected GenreMapperInterface $genreMapper;
@@ -21,8 +20,7 @@ public function __construct(
         GenreMapperInterface $genreMapper,
         UserMapperInterface $userMapper,
         TrackMapperInterface $trackMapper
-    )
-    {
+    ) {
         $this->genreMapper = $genreMapper;
         $this->userMapper = $userMapper;
         $this->trackMapper = $trackMapper;
@@ -42,7 +40,7 @@ public function bygenre(array $findParams): array
             $itemsPerPage,
             $itemsPerPage * ($pageNumber - 1)
         );
-        if($setAdditionalDescription === true) {
+        if ($setAdditionalDescription === true) {
             $tracksList = $this->decorateTracksSocial(
                 $this->decorateTracksDuration($tracksList)
             );
@@ -54,7 +52,7 @@ public function bygenre(array $findParams): array
     protected function decorateTracksSocial(array $tracksList): array
     {
         $decoratedTracks = [];
-        foreach($tracksList as $track) {
+        foreach ($tracksList as $track) {
             $decoratedTracks[] = new TrackWithSocialLinksInDescription($track);
         }
 
@@ -64,7 +62,7 @@ protected function decorateTracksSocial(array $tracksList): array
     protected function decorateTracksDuration(array $tracksList): array
     {
         $decoratedTracks = [];
-        foreach($tracksList as $track) {
+        foreach ($tracksList as $track) {
             $decoratedTracks[] = new TrackWithDurationInDescription($track);
         }
 

diff --git a/code/src/MusicStreaming/Application/UseCase/UserAuthUseCase.php b/code/src/MusicStreaming/Application/UseCase/UserAuthUseCase.php
@@ -12,8 +12,7 @@ class UserAuthUseCase
 
     public function __construct(
         UserMapperInterface $userMapper
-    )
-    {
+    ) {
         $this->userMapper = $userMapper;
     }
 

diff --git a/code/src/MusicStreaming/Application/UseCase/UserRegisterUseCase.php b/code/src/MusicStreaming/Application/UseCase/UserRegisterUseCase.php
@@ -13,8 +13,7 @@ class UserRegisterUseCase
 
     public function __construct(
         UserMapperInterface $userMapper
-    )
-    {
+    ) {
         $this->userMapper = $userMapper;
     }
 

diff --git a/code/src/MusicStreaming/Domain/Model/Functions/Functions.php b/code/src/MusicStreaming/Domain/Model/Functions/Functions.php
@@ -6,10 +6,10 @@
 
 function convertFromStringToInt(string $duration): int
 {
-    return  empty($duration)? 0: strtotime($duration);
+    return empty($duration) ? 0 : strtotime($duration);
 }
 
 function convertFromIntToString(int $duration): string
 {
     return date("H:i:s", $duration);
-}
+}
diff --git a/code/src/MusicStreaming/Domain/Model/Genre.php b/code/src/MusicStreaming/Domain/Model/Genre.php
@@ -8,14 +8,13 @@ class Genre
 {
     const FAKE_ID = -1;
 
-    private int $id; // positive int
-    private string $name;  // not empty string
+    private int $id;
+    private string $name;
 
     public function __construct(
         int $id,
         string $name
-    )
-    {
+    ) {
         $this->id = $id;
         $this->name = $name;
     }

diff --git a/code/src/MusicStreaming/Domain/Model/Playlist.php b/code/src/MusicStreaming/Domain/Model/Playlist.php
@@ -4,14 +4,14 @@
 
 namespace VKorabelnikov\Hw16\MusicStreaming\Domain\Model;
 
-use function \VKorabelnikov\Hw16\MusicStreaming\Domain\Model\Functions\convertFromIntToString;
+use function VKorabelnikov\Hw16\MusicStreaming\Domain\Model\Functions\convertFromIntToString;
 
 class Playlist implements \JsonSerializable, DurationInterface
 {
     const FAKE_ID = -1;
 
-    private int $id; // positive int
-    private string $name;  // not empty string
+    private int $id;
+    private string $name;
     private User $user;
     private array $tracksList;
 
@@ -20,8 +20,7 @@ public function __construct(
         string $name,
         User $user,
         array $tracksList
-    )
-    {
+    ) {
         $this->id = $id;
         $this->name = $name;
         $this->user = $user;
@@ -31,7 +30,7 @@ public function __construct(
     public function jsonSerialize(): mixed
     {
         return [
-            "id" => $this->id,  /////////////////////////
+            "id" => $this->id,
             "name" => $this->name,
             "user" => $this->user->getLogin(),
             "tracksList" => $this->tracksList
@@ -45,7 +44,7 @@ public function getDuration(): string
     public function getDurationSeconds(): int
     {
         $totalDuration = 0;
-        foreach($this->tracksList as $track) {
+        foreach ($this->tracksList as $track) {
             $totalDuration += $track->getDurationSeconds();
         }
         return $totalDuration;
@@ -94,19 +93,4 @@ public function setTracksList(array $tracksList): self
         $this->tracksList = $tracksList;
         return $this;
     }
-
-
-
-    /////////////////  ???????????????????????????
-
-
-    public function addTracksToList(array $tracks): self
-    {
-        return $this;
-    }
-
-    public function deleteTracksFromList(): self
-    {
-        return $this;
-    }
-}
+}
diff --git a/code/src/MusicStreaming/Domain/Model/Track.php b/code/src/MusicStreaming/Domain/Model/Track.php
@@ -4,19 +4,19 @@
 
 namespace VKorabelnikov\Hw16\MusicStreaming\Domain\Model;
 
-use function \VKorabelnikov\Hw16\MusicStreaming\Domain\Model\Functions\convertFromStringToInt;
+use function VKorabelnikov\Hw16\MusicStreaming\Domain\Model\Functions\convertFromStringToInt;
 
 class Track implements \JsonSerializable, DurationInterface, TrackInterface
 {
     const FAKE_ID = -1;
 
 
-    private int $id; // positive int
-    private string $name;  // not empty string
-    private string $author;  // not empty string
+    private int $id;
+    private string $name;
+    private string $author;
     private Genre $genre;
-    private string $duration; // timestamp?
-    private string $description; // any string
+    private string $duration;
+    private string $description;
     private string $fileLink;
     private User $user;
 
@@ -29,8 +29,7 @@ public function __construct(
         string $description,
         string $fileLink,
         User $user
-    )
-    {
+    ) {
         $this->id = $id;
         $this->name = $name;
         $this->author = $author;
@@ -152,12 +151,10 @@ protected function linkToDownload(): string
     {
         $filePathParts = explode("/", $this->fileLink);
         $partsCount = count($filePathParts);
-        if($partsCount >= 2) {
+        if ($partsCount >= 2) {
             return "/" . $filePathParts[$partsCount - 2] . "/" . $filePathParts[$partsCount - 1];
-        }
-        else
-        {
+        } else {
             return "";
         }
     }
-}
+}
diff --git a/code/src/MusicStreaming/Domain/Model/TrackDecorator.php b/code/src/MusicStreaming/Domain/Model/TrackDecorator.php
@@ -4,7 +4,7 @@
 
 namespace VKorabelnikov\Hw16\MusicStreaming\Domain\Model;
 
-class TrackDecorator implements TrackInterface, \JsonSerializable
+abstract class TrackDecorator implements TrackInterface, \JsonSerializable
 {
     protected TrackInterface $track;
 
@@ -82,14 +82,5 @@ public function jsonSerialize(): mixed
         $trackSerializeArray = $this->track->jsonSerialize();
         $trackSerializeArray["description"] = $this->getDescription();
         return $trackSerializeArray;
-        // return [
-        //     "name" => $this->track->getName(),
-        //     "author" => "",
-        //     "genre" => $this->track->getGenre()->getName(),
-        //     "duration" => $this->track->getDuration(),
-        //     "description" => $this->getDescription(),
-        //     "fileLink" => $this->fileLink,
-        //     "user" => $this->user->getLogin()
-        // ];
     }
 }
diff --git a/code/src/MusicStreaming/Domain/Model/TrackWithDurationInDescription.php b/code/src/MusicStreaming/Domain/Model/TrackWithDurationInDescription.php
@@ -10,7 +10,7 @@ public function getDescription(): string
     {
         $description = $this->track->getDescription();
         $description .= "<br><br>  Duration: "
-        . (empty($this->track->getDuration())? "unknown": $this->track->getDuration());
+        . (empty($this->track->getDuration()) ? "unknown" : $this->track->getDuration());
         return $description;
     }
 }
diff --git a/code/src/MusicStreaming/Domain/Model/User.php b/code/src/MusicStreaming/Domain/Model/User.php
@@ -9,16 +9,15 @@ class User
     const FAKE_ID = -1;
 
 
-    private int $id; // positive int
-    private string $login;  // not empty string
+    private int $id;
+    private string $login;
     private string $passwordSha1;
 
     public function __construct(
         int $id,
         string $login,
         string $passwordSha1
-    )
-    {
+    ) {
         $this->id = $id;
         $this->login = $login;
         $this->passwordSha1 = $passwordSha1;

diff --git a/code/src/MusicStreaming/Domain/ValueObject/Author.php b/code/src/MusicStreaming/Domain/ValueObject/Author.php
-Original file line number
+Diff line change
@@ Expand Up / @@ -9,4 +9,4 @@ @@
     interface ConfigInterface
     {
         public function getAllSettings(): Config;
-    }
+    }