Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add categories on json list #149

Open
wants to merge 14 commits into
base: main
Choose a base branch
from
Open

Add categories on json list #149

Show file tree
Hide file tree
Changes from 10 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
52ab9b7
Add categories on json list
danielebarbaro Oct 1, 2020
9086963
Merge branch 'main' into feature/category-json
danielebarbaro Oct 8, 2020
56838b1
Merge branch 'main' into feature/category-json
danielebarbaro Oct 13, 2020
d38bd92
Merge branch 'main' into feature/category-json
danielebarbaro Oct 14, 2020
c4af2e4
Merge branch 'main' into feature/category-json
danielebarbaro Oct 24, 2020
ac58c16
Merge branch 'main' into feature/category-json
danielebarbaro Nov 10, 2020
b5a85a3
add category on json output
danielebarbaro Nov 10, 2020
01f2967
Merge branch 'main' into feature/category-json
danielebarbaro Nov 17, 2020
62a11c0
Merge branch 'main' into feature/category-json
danielebarbaro Dec 2, 2020
6f4804e
lowercase category on json list command
danielebarbaro Dec 2, 2020
274c72a
Rename get method on category
danielebarbaro Dec 4, 2020
40c6ab3
Change Category::all method in Category::mapByService
danielebarbaro Dec 4, 2020
287333b
Merge branch 'main' into feature/category-json
danielebarbaro Dec 4, 2020
f36ffe8
Review and migrate all() from category class to allByCategory in serv…
danielebarbaro Dec 4, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion app/Commands/ListCommand.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
namespace App\Commands;

use App\InitializesCommands;
use App\Services\Category;
use App\Shell\Docker;
use LaravelZero\Framework\Commands\Command;

Expand All @@ -20,7 +21,10 @@ public function handle(): void
$containersCollection = app(Docker::class)->takeoutContainers();

if ($this->option('json')) {
$this->line($containersCollection->toJson());
$this->line($containersCollection->map(function ($item) {
$item['category'] = Category::fromContainerName($item['names']);
return $item;
})->toJson());
return;
}

Expand Down
28 changes: 28 additions & 0 deletions app/Services/Category.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

namespace App\Services;

use App\Services;

abstract class Category
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I know this has been sitting open for ages so I'm sorry to make one more request, but could you write tests for these two new methods?

Thanks so much!

{
const CACHE = 'Cache';
Expand All @@ -10,4 +12,30 @@ abstract class Category
const SEARCH = 'Search';
const STORAGE = 'Storage';
const TOOLS = 'Tools';

public static function all(): array
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this would more be a method on the Service class named allByCategory or something like that?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

all() now returns:

$result = [
    'beanstalkd' => "Cache",
    'clickhouse' => "Database",
    'dynamodb' => "Cache",
    'elasticsearch' => "Search",
    'eventstoredb' => "Database",
    'expose' => "Tools",
    'influxdb' => "Database",
    'mailhog' => "Mail",
    'mariadb' => "Database",
    'meilisearch' => "Search",
    'memcached' => "Cache",
    'minio' => "Storage",
    'mongo' => "Database",
    'mssql' => "Database",
    'mysql' => "Database",
    'neo4j' => "Database",
    'postgis' => "Database",
    'postgresql' => "Database",
    'redis' => "Cache",
    'sftp' => "Storage",
    'sqs' => "Cache"
];

so the right name (for me) is mapByService()

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sure, but I still think this is more of a list of services than a list of categories, right?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

whoops sorry 🙈 I misunderstood!
Apologies, you're right, it is a method for Service class.

{
return collect((new Services)->all())
->mapWithKeys(function ($fqcn, $shortName) {
return [$shortName => $fqcn::category()];
})
->toArray();
}

public static function get(string $serviceName): string
danielebarbaro marked this conversation as resolved.
Show resolved Hide resolved
{
$servicesByCategory = self::all();
return array_key_exists($serviceName, $servicesByCategory) ? strtolower($servicesByCategory[$serviceName]) : 'other';
}

public static function fromContainerName(string $containerName): string
{
$serviceName = array_slice(
explode('--', $containerName),
1,
1
);
$serviceName = reset($serviceName);
return self::get($serviceName);
}
}