Merge pull request #3 from soap/develop

Develop

Author: soap

src/Contracts/Generator.php

@@ -0,0 +1,8 @@
+<?php
+
+namespace Soap\Laravel\RunningNumbers\Contracts;
+
+interface Generator
+{
+    public function generate(string $name, array $options = []): string;
+}

src/Contracts/Presentable.php

@@ -0,0 +1,8 @@
+<?php
+
+namespace Soap\Laravel\RunningNumbers\Contracts;
+
+interface Presentable
+{
+    public function format(string $name, string $number): string;
+}

src/RunningNumber.php

@@ -16,14 +16,17 @@ public static function getTableName()
         return self::getTablePrefix().'running_numbers';
     }
 
+    /**
+     * @deprecated next version will remove this method, use RunningNumberGenerator::make() instead
+     */
     public static function generate(string $type, string $prefix, int $length = 3, bool $reset = false, int $resetValue = 1)
     {
         $runningNumber = RunningNumberKeeper::where('type', $type)
             ->where('prefix', $prefix)
             ->first();
 
         if (! $runningNumber) {
-            $runningNumber = new RunningNumberKeeper();
+            $runningNumber = new RunningNumberKeeper;
             $runningNumber->type = $type;
             $runningNumber->prefix = $prefix;
             if ($reset) {
@@ -44,13 +47,16 @@ public static function generate(string $type, string $prefix, int $length = 3, b
         return $prefix.str_pad($runningNumber->number, $length, '0', STR_PAD_LEFT);
     }
 
+    /**
+     * @deprecated next version will remove this method, use RunningNumberGenerator::make() instead
+     */
     public static function make(string $type, string $prefix, int $length = 3, bool $reset = false, int $resetValue = 1)
     {
         $runningNumber = RunningNumberKeeper::where('type', $type)
             ->where('prefix', $prefix)
             ->first();
         if (! $runningNumber) {
-            $runningNumber = new RunningNumberKeeper();
+            $runningNumber = new RunningNumberKeeper;
             $runningNumber->type = $type;
             $runningNumber->prefix = $prefix;
             if ($reset) {
@@ -78,7 +84,7 @@ public static function reset(string $type, string $prefix, int $value = 1)
             ->first();
 
         if (! $runningNumber) {
-            $runningNumber = new RunningNumberKeeper();
+            $runningNumber = new RunningNumberKeeper;
             $runningNumber->type = $type;
             $runningNumber->prefix = $prefix;
             $runningNumber->number = $value;
@@ -103,11 +109,51 @@ public static function list(?string $type = null, ?string $prefix = null)
         return $query->get()->toArray();
     }
 
-    public static function delete(string $type, string $prefix)
+    public static function current(string $type, string $prefix)
     {
-        RunningNumberKeeper::where('type', $type)
+        $runningNumber = RunningNumberKeeper::where('type', $type)
+            ->where('prefix', $prefix)
+            ->first();
+
+        if (! $runningNumber) {
+            return null;
+        }
+
+        return $runningNumber->number;
+    }
+
+    public static function next(string $type, string $prefix)
+    {
+        $runningNumber = RunningNumberKeeper::where('type', $type)
             ->where('prefix', $prefix)
-            ->delete();
+            ->first();
 
+        if (! $runningNumber) {
+            $runningNumber = new RunningNumberKeeper;
+            $runningNumber->type = $type;
+            $runningNumber->prefix = $prefix;
+            $runningNumber->number = 1;
+            $runningNumber->save();
+        } else {
+            $runningNumber->number += 1;
+            $runningNumber->save();
+        }
+
+        return $runningNumber->number;
+    }
+
+    public static function delete(string $type, ?string $prefix = null)
+    {
+        $query = RunningNumberKeeper::where('type', $type);
+        if ($prefix) {
+            $query->where('prefix', $prefix);
+        }
+
+        return $query->delete();
+    }
+
+    public static function flush()
+    {
+        return RunningNumberKeeper::truncate();
     }
 }

src/RunningNumberGenerator.php

@@ -0,0 +1,82 @@
+<?php
+
+namespace Soap\Laravel\RunningNumbers;
+
+use Soap\Laravel\RuningNumbers\RunningNumber;
+
+class RunningNumberGenerator
+{
+    protected $type = 'Default';
+
+    protected $prefix;
+
+    protected $length = 3;
+
+    protected $reset = false;
+
+    protected $runningNumber;
+
+    protected $format = '{PREFIX}-{NUMBER}';
+
+    public static function make()
+    {
+        return new static(self::class);
+    }
+
+    public function type($type)
+    {
+        $this->type = $type;
+
+        return $this;
+    }
+
+    public function prefix($prefix)
+    {
+        $this->prefix = $prefix;
+
+        return $this;
+    }
+
+    public function length($length)
+    {
+        $this->length = $length;
+
+        return $this;
+    }
+
+    public function reset($value = 0)
+    {
+        $this->reset = true;
+        $this->runningNumber = $value;
+
+        return $this;
+    }
+
+    /**
+     * @todo validate format tokens
+     */
+    public function format($format)
+    {
+        $this->format = $format;
+
+        return $this;
+    }
+
+    public function generate()
+    {
+        if ($this->reset) {
+            RunningNumber::reset($this->type, $this->prefix, $this->runningNumber);
+        }
+
+        $this->runningNumber = RuningNumber::next($this->type, $this->prefix);
+
+        $paddedNumber = str_pad($this->runningNumber, $this->length, '0', STR_PAD_LEFT);
+
+        return str_replace([
+            '{TYPE}', '{PREFIX}', '{NUMBER}',
+        ],
+            [$this->type, $this->prefix, $paddedNumber],
+            $this->format
+        );
+    }
+}