From 6ab19b4ca6d758f834941ed2b34602d80aa3847d Mon Sep 17 00:00:00 2001
From: AqibYounasAtTkxel <94671546+AqibYounasAtTkxel@users.noreply.github.com>
Date: Fri, 23 Sep 2022 09:21:20 +0500
Subject: [PATCH 1/3] initial commit 4136

---
 app/Models/IndependentActivity.php            |  1 +
 ..._activities_table_and_columns_addition.php | 38 +++++++++++++++++++
 ..._21_161808_drop_indp-activities_tables.php | 31 +++++++++++++++
 3 files changed, 70 insertions(+)
 create mode 100644 database/migrations/2022_09_21_102544_update_activities_table_and_columns_addition.php
 create mode 100644 database/migrations/2022_09_21_161808_drop_indp-activities_tables.php

diff --git a/app/Models/IndependentActivity.php b/app/Models/IndependentActivity.php
index f84f2d44e..461b0c660 100644
--- a/app/Models/IndependentActivity.php
+++ b/app/Models/IndependentActivity.php
@@ -14,6 +14,7 @@ class IndependentActivity extends Model
      *
      * @var array
      */
+    protected $table = 'activities';
     protected $fillable = [
         'title',
         'type',
diff --git a/database/migrations/2022_09_21_102544_update_activities_table_and_columns_addition.php b/database/migrations/2022_09_21_102544_update_activities_table_and_columns_addition.php
new file mode 100644
index 000000000..320a6ea5e
--- /dev/null
+++ b/database/migrations/2022_09_21_102544_update_activities_table_and_columns_addition.php
@@ -0,0 +1,38 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class UpdateActivitiesTableAndColumnsAddition extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('activities', function (Blueprint $table) {
+            $table->foreignId('organization_visibility_type_id')->nullable();
+            $table->unsignedBigInteger('cloned_from')->nullable()->default(null);
+            $table->unsignedBigInteger('clone_ctr')->nullable()->default(0);
+            $table->tinyInteger('status')->nullable()->default(1); // 1 is for draft
+            $table->tinyInteger('indexing')->nullable()->default(null); // null - indexing is not requested
+            $table->unsignedBigInteger('original_user')->nullable()->default(null);
+            $table->enum('activity_type', ['ACTIVITY', 'INDEPENDENT', 'STANDALONE'])->default("ACTIVITY");
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('activities', function (Blueprint $table) {
+            //
+        });
+    }
+}
diff --git a/database/migrations/2022_09_21_161808_drop_indp-activities_tables.php b/database/migrations/2022_09_21_161808_drop_indp-activities_tables.php
new file mode 100644
index 000000000..98fe5ea71
--- /dev/null
+++ b/database/migrations/2022_09_21_161808_drop_indp-activities_tables.php
@@ -0,0 +1,31 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class DropIndpActivitiesTables extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::dropIfExists('independent_activities');
+        Schema::dropIfExists('independent_activity_author_tag');
+        Schema::dropIfExists('independent_activity_education_level');
+        Schema::dropIfExists('independent_activity_subject');
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        //
+    }
+}

From 28365a03abf40f46187d386243b52f707094d37e Mon Sep 17 00:00:00 2001
From: AqibYounasAtTkxel <94671546+AqibYounasAtTkxel@users.noreply.github.com>
Date: Fri, 23 Sep 2022 14:30:15 +0500
Subject: [PATCH 2/3] CUR-4136 Database change for table "Activities" -
 constrainst property added to migration

---
 ...9_21_102544_update_activities_table_and_columns_addition.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/database/migrations/2022_09_21_102544_update_activities_table_and_columns_addition.php b/database/migrations/2022_09_21_102544_update_activities_table_and_columns_addition.php
index 320a6ea5e..07add397a 100644
--- a/database/migrations/2022_09_21_102544_update_activities_table_and_columns_addition.php
+++ b/database/migrations/2022_09_21_102544_update_activities_table_and_columns_addition.php
@@ -14,7 +14,7 @@ class UpdateActivitiesTableAndColumnsAddition extends Migration
     public function up()
     {
         Schema::table('activities', function (Blueprint $table) {
-            $table->foreignId('organization_visibility_type_id')->nullable();
+            $table->foreignId('organization_visibility_type_id')->nullable()->constrained();
             $table->unsignedBigInteger('cloned_from')->nullable()->default(null);
             $table->unsignedBigInteger('clone_ctr')->nullable()->default(0);
             $table->tinyInteger('status')->nullable()->default(1); // 1 is for draft

From da7844f40719f024c88feff64b0ded55b7856ae3 Mon Sep 17 00:00:00 2001
From: AqibYounasAtTkxel <94671546+AqibYounasAtTkxel@users.noreply.github.com>
Date: Fri, 23 Sep 2022 16:43:08 +0500
Subject: [PATCH 3/3] CUR-4136 removing the drop tables migration for now

---
 ..._21_161808_drop_indp-activities_tables.php | 31 -------------------
 1 file changed, 31 deletions(-)
 delete mode 100644 database/migrations/2022_09_21_161808_drop_indp-activities_tables.php

diff --git a/database/migrations/2022_09_21_161808_drop_indp-activities_tables.php b/database/migrations/2022_09_21_161808_drop_indp-activities_tables.php
deleted file mode 100644
index 98fe5ea71..000000000
--- a/database/migrations/2022_09_21_161808_drop_indp-activities_tables.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-
-use Illuminate\Database\Migrations\Migration;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Support\Facades\Schema;
-
-class DropIndpActivitiesTables extends Migration
-{
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
-    public function up()
-    {
-        Schema::dropIfExists('independent_activities');
-        Schema::dropIfExists('independent_activity_author_tag');
-        Schema::dropIfExists('independent_activity_education_level');
-        Schema::dropIfExists('independent_activity_subject');
-    }
-
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
-    public function down()
-    {
-        //
-    }
-}