Issue #000 fix: remove timestamp from the name of the child observation

.env.sample

@@ -98,4 +98,4 @@ ORG_UPDATES_TOPIC = elevate_project_org_extension_event_listener
 
 USER_ACCOUNT_EVENT_TOPIC = elevate_user_account_event_listener                  // Kafka topic to listen user account events
 SESSION_VERIFICATION_METHOD = user_service_authenticated                        // session verification method
-USER_SERVICE_INTERNAL_ACCESS_TOKEN_HEADER_KEY = internal_access_token           // user service's internal access token header key
+USER_SERVICE_INTERNAL_ACCESS_TOKEN_HEADER_KEY = internal_access_token           // user service's internal access token header key.

.github/workflows/brac-dev-deployment.yaml

@@ -0,0 +1,81 @@
+name: Dev Build & Deploy Project Service (BRAC)
+
+on:
+  push:
+    branches:
+      - develop
+
+env:
+  AWS_REGION: ${{ secrets.AWS_REGION }}
+  ECR_REPOSITORY: ${{ secrets.ECR_REPOSITORY_BRAC }}
+  AWS_ACCOUNT_ID: ${{ secrets.AWS_ACCOUNT_ID }}
+
+jobs:
+  build-and-deploy:
+    runs-on: ubuntu-latest
+
+    permissions:
+      contents: read
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      # =========================
+      # AWS Authentication
+      # =========================
+      - name: Configure AWS credentials
+        uses: aws-actions/configure-aws-credentials@v4
+        with:
+          aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
+          aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+          aws-region: ${{ env.AWS_REGION }}
+
+      # =========================
+      # Login to Amazon ECR
+      # =========================
+      - name: Login to Amazon ECR
+        uses: aws-actions/amazon-ecr-login@v2
+
+      # =========================
+      # Build & Push Image
+      # =========================
+      - name: Build and Push Docker Image to ECR
+        uses: docker/build-push-action@v5
+        with:
+          context: .
+          push: true
+          tags: |
+            ${{ env.AWS_ACCOUNT_ID }}.dkr.ecr.${{ env.AWS_REGION }}.amazonaws.com/${{ env.ECR_REPOSITORY }}:latest-brac
+            ${{ env.AWS_ACCOUNT_ID }}.dkr.ecr.${{ env.AWS_REGION }}.amazonaws.com/${{ env.ECR_REPOSITORY }}:${{ github.sha }}
+
+      # =========================
+      # Deploy on Server
+      # =========================
+      - name: Deploy Stack
+        uses: appleboy/ssh-action@master
+        with:
+          host: ${{ secrets.HOST_NAME_DEV }}
+          username: ${{ secrets.USERNAME_DEV }}
+          key: ${{ secrets.SSH_KEY_DEV }}
+          port: ${{ secrets.PORT_DEV }}
+          script: |
+            set -e
+
+            # Export AWS variables explicitly
+            export AWS_REGION="${{ secrets.AWS_REGION }}"
+            export AWS_ACCOUNT_ID="${{ secrets.AWS_ACCOUNT_ID }}"
+
+            cd ${{ secrets.TARGET_DIR_DEV }}
+
+            if [ -f .env ]; then
+              mv .env .env-bkp
+            fi
+
+            echo '${{ secrets.DEV_ENV_BRAC }}' > .env
+
+            aws ecr get-login-password --region "$AWS_REGION" \
+              | docker login --username AWS \
+                --password-stdin "$AWS_ACCOUNT_ID.dkr.ecr.$AWS_REGION.amazonaws.com"
+
+            ./deploy.sh

config/kafka.js

@@ -14,6 +14,7 @@ const USER_DELETE_ON_OFF = process.env.USER_DELETE_ON_OFF
 const COURSES_TOPIC = process.env.USER_COURSES_SUBMISSION_TOPIC
 const ORG_EXTENSION_TOPIC = process.env.ORG_UPDATES_TOPIC
 const USER_ACCOUNT_EVENT_TOPIC = process.env.USER_ACCOUNT_EVENT_TOPIC
+const USER_ACTIVITY_TOPIC = process.env.USER_ACTIVITY_TOPIC
 
 /**
  * Kafka configurations.
@@ -59,6 +60,9 @@ const connect = function () {
 
 	// consume event that produced by the user service
 	_sendToKafkaConsumers(USER_ACCOUNT_EVENT_TOPIC, process.env.KAFKA_URL)
+
+	_sendToKafkaConsumers(USER_ACTIVITY_TOPIC, process.env.KAFKA_URL)
+
 	return {
 		kafkaProducer: producer,
 		kafkaClient: client,
@@ -85,10 +89,10 @@ var _sendToKafkaConsumers = function (topic, host) {
 		)
 
 		consumer.on('message', async function (message) {
-			console.log('-------Kafka consumer log starts here------------------')
-			console.log('Topic Name: ', topic)
-			console.log('Message: ', JSON.stringify(message))
-			console.log('-------Kafka consumer log ends here------------------')
+			// console.log('-------Kafka consumer log starts here------------------')
+			// console.log('Topic Name: ', topic)
+			// console.log('Message: ', JSON.stringify(message))
+			// console.log('-------Kafka consumer log ends here------------------')
 
 			if (message && message.topic === SUBMISSION_TOPIC) {
 				submissionsConsumer.messageReceived(message)
@@ -117,6 +121,11 @@ var _sendToKafkaConsumers = function (topic, host) {
 			if (message && message.topic === USER_ACCOUNT_EVENT_TOPIC) {
 				userExtensionConsumer.messageReceived(message)
 			}
+
+			// call projectActivity consumer
+			if (message && message.topic === USER_ACTIVITY_TOPIC) {
+				userActivitiesConsumer.messageReceived(message)
+			}
 		})
 
 		consumer.on('error', async function (error) {
@@ -143,6 +152,10 @@ var _sendToKafkaConsumers = function (topic, host) {
 			if (error.topics && error.topics[0] === USER_ACCOUNT_EVENT_TOPIC) {
 				userExtensionConsumer.errorTriggered(error)
 			}
+
+			if (error.topics && error.topics[0] === USER_ACTIVITY_TOPIC) {
+				userActivitiesConsumer.errorTriggered(error)
+			}
 		})
 	}
 }

constants/interface-routes/elevate-project/configs.json

@@ -905,6 +905,62 @@
 			],
 			"service": "project"
 		},
+		{
+			"sourceRoute": "/project/v1/library/categories/delete/:id",
+			"type": "DELETE",
+			"priority": "MUST_HAVE",
+			"inSequence": false,
+			"orchestrated": false,
+			"targetPackages": [
+				{
+					"basePackageName": "project",
+					"packageName": "elevate-project"
+				}
+			],
+			"service": "project"
+		},
+		{
+			"sourceRoute": "/project/v1/library/categories/details/:id",
+			"type": "GET",
+			"priority": "MUST_HAVE",
+			"inSequence": false,
+			"orchestrated": false,
+			"targetPackages": [
+				{
+					"basePackageName": "project",
+					"packageName": "elevate-project"
+				}
+			],
+			"service": "project"
+		},
+		{
+			"sourceRoute": "/project/v1/programUsers/createOrUpdate",
+			"type": "POST",
+			"priority": "MUST_HAVE",
+			"inSequence": false,
+			"orchestrated": false,
+			"targetPackages": [
+				{
+					"basePackageName": "project",
+					"packageName": "elevate-project"
+				}
+			],
+			"service": "project"
+		},
+		{
+			"sourceRoute": "/project/v1/programUsers/getEntities",
+			"type": "GET",
+			"priority": "MUST_HAVE",
+			"inSequence": false,
+			"orchestrated": false,
+			"targetPackages": [
+				{
+					"basePackageName": "project",
+					"packageName": "elevate-project"
+				}
+			],
+			"service": "project"
+		},
 		{
 			"sourceRoute": "/project/v1/programs/create",
 			"type": "POST",
@@ -1521,6 +1577,20 @@
 			],
 			"service": "project"
 		},
+		{
+			"sourceRoute": "/project/v1/userProjects/createProjectPlan",
+			"type": "POST",
+			"priority": "MUST_HAVE",
+			"inSequence": false,
+			"orchestrated": false,
+			"targetPackages": [
+				{
+					"basePackageName": "project",
+					"packageName": "elevate-project"
+				}
+			],
+			"service": "project"
+		},
 		{
 			"sourceRoute": "/project/v1/userProjects/update",
 			"type": "POST",

controllers/v1/library/categories.js

@@ -36,7 +36,7 @@ module.exports = class LibraryCategories extends Abstract {
 	}
 
 	/**
-    * @api {get} /improvement-project/api/v1/library/categories/projects/:categoryExternalId?page=:page&limit=:limit&search=:search&sort=:sort 
+    * @api {get} /improvement-project/api/v1/library/categories/projects/:categoryExternalId?page=:page&limit=:limit&search=:search&sort=:sort
     * List of library projects.
     * @apiVersion 1.0.0
     * @apiGroup Library Categories
@@ -56,7 +56,7 @@ module.exports = class LibraryCategories extends Abstract {
                 "description" : "Test template description",
                 "createdAt": "2020-08-31T05:59:12.230Z"
             }
-        ], 
+        ],
         "count": 7
     }
     }
@@ -179,7 +179,7 @@ module.exports = class LibraryCategories extends Abstract {
 	}
 
 	/**
-    * @api {get} /improvement-project/api/v1/library/categories/list 
+    * @api {get} /improvement-project/api/v1/library/categories/list
     * List of library categories.
     * @apiVersion 1.0.0
     * @apiGroup Library Categories
@@ -240,7 +240,66 @@ module.exports = class LibraryCategories extends Abstract {
 	async list(req) {
 		return new Promise(async (resolve, reject) => {
 			try {
-				let projectCategories = await libraryCategoriesHelper.list(req)
+				let projectCategories = await libraryCategoriesHelper.list(req.searchText, req.query, req.userDetails)
+
+				projectCategories.result = projectCategories.data
+
+				return resolve(projectCategories)
+			} catch (error) {
+				return reject({
+					status: error.status || HTTP_STATUS_CODE.internal_server_error.status,
+					message: error.message || HTTP_STATUS_CODE.internal_server_error.message,
+					errorObject: error,
+				})
+			}
+		})
+	}
+
+	/**
+	 * delete a library category
+	 * @method
+	 * @name delete
+	 * @param {Object} req - requested data
+	 * @returns {Array} Library categories.
+	 */
+
+	async delete(req) {
+		return new Promise(async (resolve, reject) => {
+			try {
+				const filterQuery = {
+					_id: req.params._id,
+				}
+				let projectCategories = await libraryCategoriesHelper.delete(filterQuery, req.userDetails)
+
+				projectCategories.result = projectCategories.data
+
+				return resolve(projectCategories)
+			} catch (error) {
+				return reject({
+					status: error.status || HTTP_STATUS_CODE.internal_server_error.status,
+					message: error.message || HTTP_STATUS_CODE.internal_server_error.message,
+					errorObject: error,
+				})
+			}
+		})
+	}
+
+	/**
+	 * read a library category
+	 * @method
+	 * @name details
+	 * @param {Object} req - requested data
+	 * @returns {Array} Library categories.
+	 */
+
+	async details(req) {
+		return new Promise(async (resolve, reject) => {
+			try {
+				const filterQuery = {
+					_id: req.params._id,
+					getChildren: req.query.getChildren === 'true',
+				}
+				let projectCategories = await libraryCategoriesHelper.details(filterQuery, req.userDetails)
 
 				projectCategories.result = projectCategories.data