Merge remote-tracking branch 'origin/master'

# Conflicts:
#	.idea/php.xml
#	.idea/yii2-api-template.iml
#	composer.json

Author: Angel Garcia

.idea/php.xml

@@ -0,0 +1,10 @@
+<?php
+namespace Helper;
+
+// here you can define custom actions
+// all public methods declared in helper class will be available in $I
+
+class Api extends \Codeception\Module
+{
+
+}

.idea/yii2-api-template.iml

@@ -150,3 +150,36 @@ To apply the migrations execute the command
 
 To revert the migrations execute the command 
 ```./yii migrate/down```
+
+### Congiguration of tests
+install codeception 
+``composer require codeception/codeception --dev``
+
+create folder named `tests` in your project after execute follow command
+```./vendor/bin/codecept bootstrap```
+
+to active test to api execute
+``` ./vendor/bin/codecept generate:suite api ```
+
+for create a new test of api execute 
+``` ./vendor/bin/codecept generate:cest api CreateUser```
+
+create unit test execute the follow command
+``` ./vendor/bin/codecept generate:test unit Example```
+
+create advanced tests execute 
+```./vendor/bin/codecept generate:cest suitename CestName ```
+
+
+for execute all tests execute
+```./vendor/bin/codecept run ```
+
+for execute only the unit test execute
+``` ./vendor/bin/codecept run unit ```
+
+run test of only file
+``` ./vendor/bin/codecept run tests/api/UserCest.php```
+
+
+
+

Helper/Api.php

@@ -65,6 +65,14 @@
                 }
             },
         ],
+        'db' => [
+            'class' => 'yii\db\Connection',
+            'dsn' => 'mysql:host=127.0.0.1;port=3306;dbname=yii_app',
+            'username' => 'root',
+            'password' => 'm4r14l3j',
+            'charset' => 'utf8',
+
+        ]
     ],
     'params' => $params,
     'controllerMap' => [

README.md

@@ -1,5 +1,33 @@
 <?php
+/*
+$config =  yii\helpers\ArrayHelper::merge(
+    require(__DIR__ . '/main.php'),
+    require(__DIR__ . '/main-local.php'),
+    [
+        'id' => 'app-tests',
+        'components' => [
+            'db' => [
+                'dsn' => 'mysql:host=localhost;dbname=yii_app_test',
+            ]
+        ]
+    ]
+);
+return $config;
+*/
 
 return [
     'id' => 'app-api-tests',
-];
+    'basePath' => dirname(__DIR__),
+    'components' => [
+        'db2' => [
+            'class' => 'yii\db\Connection',
+            'dsn' => 'mysql:host=127.0.0.1;dbname=yii_app_test',
+            'username' => 'root',
+            'password' => 'm4r14l3j',
+            'charset' => 'utf8',
+        ]
+    ]
+];
+
+
+

api/config/main.php

@@ -6,6 +6,7 @@
         'extraPatterns' => [
             'GET status' => 'status',
             'POST signup' => 'signup',
+            'POST register' => 'register'
         ],
         'except' => ['create', 'delete', 'update', 'view', 'index'],
     ],

api/config/test.php

@@ -3,7 +3,10 @@
 namespace api\modules\v1\controllers;
 
 
+use api\modules\v1\models\User;
 use base\rest\ActiveController;
+use phpDocumentor\Reflection\Types\Null_;
+use Yii;
 use yii\filters\auth\CompositeAuth;
 use yii\filters\auth\HttpBearerAuth;
 use yii\helpers\ArrayHelper;
@@ -18,7 +21,7 @@ public function behaviors()
             [
                 'class' => CompositeAuth::class,
                 // Status endpoint is inherited from the ActiveController class
-                'except' => ['status', 'signup'],
+                'except' => ['status', 'signup', 'register'],
                 'authMethods' => [
                     HttpBearerAuth::class,
                 ],
@@ -28,7 +31,45 @@ public function behaviors()
 
     public function actionSignup()
     {
-        return 'working';
+        $model = new User();
+        $request = Yii::$app->request->post();
+
+        $model->username = $request["username"];
+        $model->password = $request["password"];
+
+        $response = $model->login();
+
+        return $response;
+
     }
 
+    public function actionRegister(){
+        $model = new User();
+        $request = Yii::$app->request->post();
+
+        $model->username = $request["username"];
+        $model->password = $request["password"];
+        $model->email = $request["username"];
+
+        $user  = User::find()
+            ->where(['username' => $model->username])
+            ->one();
+
+        if($user == null){
+            $register = User::register($model);
+            return $register;
+
+        }
+        else{
+            return ["message" => "username is used by other user"];
+
+        }
+        $response = $model->register();
+
+        return $response;
+
+    }
+
+
+
 }