From 1c0ea46bddac4297b0f84cd787c7b56fcd2a9a0e Mon Sep 17 00:00:00 2001 From: Mehdi Aslani Date: Sat, 12 Sep 2026 00:19:44 +0330 Subject: [PATCH] first --- .gitattributes | 2 + .gitignore | 33 ++ .mvn/wrapper/maven-wrapper.properties | 3 + CALLBACK-CONFIG.md | 110 +++++++ README.md | 55 ++++ mvnw | 295 ++++++++++++++++++ mvnw.cmd | 189 +++++++++++ pom.xml | 73 +++++ scripts/callback-agi | 13 + .../peeco/callback/CallbackApplication.java | 16 + .../ir/peeco/callback/agi/CallbackAgi.java | 122 ++++++++ .../java/ir/peeco/callback/model/TblCdr.java | 73 +++++ .../callback/service/CallbackCandidate.java | 6 + .../callback/service/CallbackService.java | 85 +++++ .../service/PhoneNumberNormalizer.java | 27 ++ src/main/resources/application.properties | 27 ++ src/main/resources/logback-spring.xml | 12 + .../callback/CallbackApplicationTests.java | 13 + .../callback/PhoneNumberNormalizerTests.java | 15 + src/test/resources/application.properties | 7 + 20 files changed, 1176 insertions(+) create mode 100644 .gitattributes create mode 100644 .gitignore create mode 100644 .mvn/wrapper/maven-wrapper.properties create mode 100644 CALLBACK-CONFIG.md create mode 100644 README.md create mode 100755 mvnw create mode 100644 mvnw.cmd create mode 100644 pom.xml create mode 100755 scripts/callback-agi create mode 100644 src/main/java/ir/peeco/callback/CallbackApplication.java create mode 100644 src/main/java/ir/peeco/callback/agi/CallbackAgi.java create mode 100644 src/main/java/ir/peeco/callback/model/TblCdr.java create mode 100644 src/main/java/ir/peeco/callback/service/CallbackCandidate.java create mode 100644 src/main/java/ir/peeco/callback/service/CallbackService.java create mode 100644 src/main/java/ir/peeco/callback/service/PhoneNumberNormalizer.java create mode 100644 src/main/resources/application.properties create mode 100644 src/main/resources/logback-spring.xml create mode 100644 src/test/java/ir/peeco/callback/CallbackApplicationTests.java create mode 100644 src/test/java/ir/peeco/callback/PhoneNumberNormalizerTests.java create mode 100644 src/test/resources/application.properties diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..3b41682 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,2 @@ +/mvnw text eol=lf +*.cmd text eol=crlf diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..667aaef --- /dev/null +++ b/.gitignore @@ -0,0 +1,33 @@ +HELP.md +target/ +.mvn/wrapper/maven-wrapper.jar +!**/src/main/**/target/ +!**/src/test/**/target/ + +### STS ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache + +### IntelliJ IDEA ### +.idea +*.iws +*.iml +*.ipr + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ +build/ +!**/src/main/**/build/ +!**/src/test/**/build/ + +### VS Code ### +.vscode/ diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties new file mode 100644 index 0000000..216df05 --- /dev/null +++ b/.mvn/wrapper/maven-wrapper.properties @@ -0,0 +1,3 @@ +wrapperVersion=3.3.4 +distributionType=only-script +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.16/apache-maven-3.9.16-bin.zip diff --git a/CALLBACK-CONFIG.md b/CALLBACK-CONFIG.md new file mode 100644 index 0000000..8579eaf --- /dev/null +++ b/CALLBACK-CONFIG.md @@ -0,0 +1,110 @@ +# راهنمای تنظیمات Callback AGI + +تمام تنظیمات اجرای برنامه در فایل +[`src/main/resources/application.properties`](src/main/resources/application.properties) +قرار دارد. این AGI به هیچ پارامتر خط فرمانی نیاز ندارد. + +## تنظیمات اصلی برنامه + +| پارامتر | توضیح | +|---|---| +| `spring.application.name` | نام برنامه Spring است. | +| `spring.main.web-application-type` | برنامه را در حالت غیر وب اجرا می‌کند، چون این پروژه یک AGI برای Asterisk است. | +| `debug` | حالت debug مربوط به Spring Boot را فعال یا غیرفعال می‌کند. | + +## تنظیمات لاگ + +| پارامتر | توضیح | +|---|---| +| `logging.level.root` | سطح پیش‌فرض لاگ‌های برنامه. | +| `logging.level.org.springframework` | سطح لاگ Spring Framework و Spring Boot. | +| `logging.level.org.hibernate` | سطح لاگ Hibernate و JPA. | +| `logging.level.com.zaxxer.hikari` | سطح لاگ connection pool مربوط به HikariCP. | + +## تنظیمات دیتابیس و JPA + +| پارامتر | توضیح | +|---|---| +| `spring.datasource.url` | آدرس اتصال JDBC به PostgreSQL. | +| `spring.datasource.username` | نام کاربری PostgreSQL. | +| `spring.datasource.password` | رمز عبور PostgreSQL. | +| `spring.datasource.hikari.maximum-pool-size` | حداکثر تعداد connectionهای موجود در pool. | +| `spring.datasource.hikari.connection-timeout` | حداکثر زمان انتظار برای گرفتن connection از pool، برحسب میلی‌ثانیه. | +| `spring.jpa.hibernate.ddl-auto` | نحوه مدیریت schema دیتابیس. مقدار `none` مانع تغییر schema موجود توسط Hibernate می‌شود. | +| `spring.jpa.open-in-view` | باز نگه داشتن EntityManager در لایه وب. برای این پروژه غیرفعال است، چون برنامه وب نیست. | +| `spring.jpa.properties.hibernate.jdbc.time_zone` | منطقه زمانی مورد استفاده JDBC و Hibernate برای timestampها. | + +## تنظیمات Asterisk و IVR + +| پارامتر | توضیح | +|---|---| +| `callback.agi.dial-prefix` | پیشوند کانال برای تماس با داخلی کارمند؛ مانند `PJSIP/` یا `SIP/`. | +| `callback.agi.dial-timeout-seconds` | مدت زمان زنگ خوردن داخلی برحسب ثانیه. | +| `callback.agi.ivr-context` | نام context مربوط به IVR اصلی در dialplan. | +| `callback.agi.ivr-extension` | extension مقصد در context مربوط به IVR. برای تماس ورودی معمولاً `s` است. | +| `callback.agi.ivr-priority` | priorityای که اجرای IVR از آن شروع می‌شود. | + +در شرایط زیر تماس به IVR منتقل می‌شود: + +- قابلیت callback غیرفعال باشد. +- callback مناسبی برای مشتری پیدا نشود. +- داخلی پاسخ ندهد. +- در جست‌وجو یا اتصال به دیتابیس خطایی رخ دهد. + +مقصد IVR از ترکیب سه مقدار زیر ساخته می‌شود: + +```text +callback.agi.ivr-context,callback.agi.ivr-extension,callback.agi.ivr-priority +``` + +با تنظیمات فعلی، مقصد تماس این است: + +```text +from-trunk,s,1 +``` + +اگر context شما مثلاً `company-ivr` است، مقدار زیر را تغییر دهید: + +```properties +callback.agi.ivr-context=company-ivr +``` + +## تنظیمات رفتار Callback + +| پارامتر | توضیح | +|---|---| +| `callback.agi.enabled` | فعال یا غیرفعال بودن callback. اگر `false` باشد، همه تماس‌ها مستقیماً به IVR می‌روند و جدول `tbl_cdr` بررسی یا تغییر داده نمی‌شود. | +| `callback.agi.lookback-minutes` | بازه جست‌وجوی تماس‌های خروجی ناموفق برحسب دقیقه. مقدار `60` یعنی یک ساعت. | +| `callback.agi.claim-value` | مقدار موقت ستون `tbl_cdr.target` هنگام شروع callback. این مقدار برای قفل هم‌زمانی استفاده می‌شود. | +| `callback.agi.done-value` | مقدار نهایی ستون `tbl_cdr.target` بعد از پاسخ داخلی. پس از آن، تماس بعدی همان مشتری به IVR می‌رود. | + +## نمونه تنظیمات + +### فعال بودن Callback برای یک ساعت گذشته + +```properties +callback.agi.enabled=true +callback.agi.lookback-minutes=60 +``` + +### غیرفعال کردن کامل Callback + +```properties +callback.agi.enabled=false +``` + +در این حالت تمام تماس‌ها بدون جست‌وجوی callback به IVR می‌روند. + +### استفاده از IVR متفاوت + +```properties +callback.agi.ivr-context=my-ivr +callback.agi.ivr-extension=s +callback.agi.ivr-priority=1 +``` + +### تغییر بازه جست‌وجو به ۳۰ دقیقه + +```properties +callback.agi.lookback-minutes=30 +``` diff --git a/README.md b/README.md new file mode 100644 index 0000000..ab0775a --- /dev/null +++ b/README.md @@ -0,0 +1,55 @@ +# Callback AGI + +این پروژه یک AGI برای Asterisk است که قبل از IVR، آخرین تماس خروجی ناموفق +به مشتری را در یک ساعت گذشته پیدا می‌کند. رکورد با مقدار `target = 'pending'` +به‌صورت اتمیک قفل می‌شود؛ در صورت پاسخ داخلی، مقدار آن به `callback_done` +تغییر می‌کند و در غیر این صورت قفل آزاد شده و تماس به IVR می‌رود. + +## ساخت و نصب + +```bash +./mvnw package +install -m 0755 scripts/callback-agi /var/lib/asterisk/agi-bin/callback-agi +``` + +مسیر JAR را با متغیر `CALLBACK_AGI_JAR` تنظیم کنید. اسکریپت باید در نقطه ورود +تماس ورودی به‌عنوان AGI موجود نصب شود؛ خود پروژه نیازی به تغییر dialplan ندارد. + +برای اجرای محلی از ریشه پروژه، wrapper به‌صورت خودکار JAR داخل `target/` را +پیدا می‌کند: + +```bash +./mvnw clean package +printf 'agi_callerid: 09121234567\nagi_dnid: 02112345678\n\n' | ./scripts/callback-agi +``` + +این برنامه یک AGI غیر وب است و بدون آرگومان اجرا می‌شود. برنامه ورودی AGI را +از stdin می‌خواند و تنظیمات آن از `application.properties` خوانده می‌شوند. + +```bash +./mvnw spring-boot:run +``` + +## تنظیمات + +تمام تنظیمات در فایل +[`CALLBACK-CONFIG.md`](CALLBACK-CONFIG.md) مستند شده‌اند. +مقادیر را مستقیماً در `src/main/resources/application.properties` تغییر دهید. + +مقدار `agi_callerid` نرمال می‌شود؛ پیشوندهای `+98`، `0098` و صفر ابتدایی، +فاصله و خط تیره حذف می‌شوند. `agi_dnid` برای ثبت رکورد لازم نیست و برای +تطبیق callback عمداً استفاده نمی‌شود. + +## نکات دیتابیس + +برای سرعت lookup، در صورت امکان migration زیر را اجرا کنید: + +```sql +CREATE INDEX IF NOT EXISTS idx_callback_lookup +ON tbl_cdr (real_dst, calldate DESC) +WHERE direction_call = 'outbound' + AND disposition IN ('NO ANSWER', 'BUSY', 'FAILED'); +``` + +ستون `target` باید nullable باشد. نام و رمز عبور دیتابیس را در source code +قرار ندهید. diff --git a/mvnw b/mvnw new file mode 100755 index 0000000..bd8896b --- /dev/null +++ b/mvnw @@ -0,0 +1,295 @@ +#!/bin/sh +# ---------------------------------------------------------------------------- +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# ---------------------------------------------------------------------------- + +# ---------------------------------------------------------------------------- +# Apache Maven Wrapper startup batch script, version 3.3.4 +# +# Optional ENV vars +# ----------------- +# JAVA_HOME - location of a JDK home dir, required when download maven via java source +# MVNW_REPOURL - repo url base for downloading maven distribution +# MVNW_USERNAME/MVNW_PASSWORD - user and password for downloading maven +# MVNW_VERBOSE - true: enable verbose log; debug: trace the mvnw script; others: silence the output +# ---------------------------------------------------------------------------- + +set -euf +[ "${MVNW_VERBOSE-}" != debug ] || set -x + +# OS specific support. +native_path() { printf %s\\n "$1"; } +case "$(uname)" in +CYGWIN* | MINGW*) + [ -z "${JAVA_HOME-}" ] || JAVA_HOME="$(cygpath --unix "$JAVA_HOME")" + native_path() { cygpath --path --windows "$1"; } + ;; +esac + +# set JAVACMD and JAVACCMD +set_java_home() { + # For Cygwin and MinGW, ensure paths are in Unix format before anything is touched + if [ -n "${JAVA_HOME-}" ]; then + if [ -x "$JAVA_HOME/jre/sh/java" ]; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + JAVACCMD="$JAVA_HOME/jre/sh/javac" + else + JAVACMD="$JAVA_HOME/bin/java" + JAVACCMD="$JAVA_HOME/bin/javac" + + if [ ! -x "$JAVACMD" ] || [ ! -x "$JAVACCMD" ]; then + echo "The JAVA_HOME environment variable is not defined correctly, so mvnw cannot run." >&2 + echo "JAVA_HOME is set to \"$JAVA_HOME\", but \"\$JAVA_HOME/bin/java\" or \"\$JAVA_HOME/bin/javac\" does not exist." >&2 + return 1 + fi + fi + else + JAVACMD="$( + 'set' +e + 'unset' -f command 2>/dev/null + 'command' -v java + )" || : + JAVACCMD="$( + 'set' +e + 'unset' -f command 2>/dev/null + 'command' -v javac + )" || : + + if [ ! -x "${JAVACMD-}" ] || [ ! -x "${JAVACCMD-}" ]; then + echo "The java/javac command does not exist in PATH nor is JAVA_HOME set, so mvnw cannot run." >&2 + return 1 + fi + fi +} + +# hash string like Java String::hashCode +hash_string() { + str="${1:-}" h=0 + while [ -n "$str" ]; do + char="${str%"${str#?}"}" + h=$(((h * 31 + $(LC_CTYPE=C printf %d "'$char")) % 4294967296)) + str="${str#?}" + done + printf %x\\n $h +} + +verbose() { :; } +[ "${MVNW_VERBOSE-}" != true ] || verbose() { printf %s\\n "${1-}"; } + +die() { + printf %s\\n "$1" >&2 + exit 1 +} + +trim() { + # MWRAPPER-139: + # Trims trailing and leading whitespace, carriage returns, tabs, and linefeeds. + # Needed for removing poorly interpreted newline sequences when running in more + # exotic environments such as mingw bash on Windows. + printf "%s" "${1}" | tr -d '[:space:]' +} + +scriptDir="$(dirname "$0")" +scriptName="$(basename "$0")" + +# parse distributionUrl and optional distributionSha256Sum, requires .mvn/wrapper/maven-wrapper.properties +while IFS="=" read -r key value; do + case "${key-}" in + distributionUrl) distributionUrl=$(trim "${value-}") ;; + distributionSha256Sum) distributionSha256Sum=$(trim "${value-}") ;; + esac +done <"$scriptDir/.mvn/wrapper/maven-wrapper.properties" +[ -n "${distributionUrl-}" ] || die "cannot read distributionUrl property in $scriptDir/.mvn/wrapper/maven-wrapper.properties" + +case "${distributionUrl##*/}" in +maven-mvnd-*bin.*) + MVN_CMD=mvnd.sh _MVNW_REPO_PATTERN=/maven/mvnd/ + case "${PROCESSOR_ARCHITECTURE-}${PROCESSOR_ARCHITEW6432-}:$(uname -a)" in + *AMD64:CYGWIN* | *AMD64:MINGW*) distributionPlatform=windows-amd64 ;; + :Darwin*x86_64) distributionPlatform=darwin-amd64 ;; + :Darwin*arm64) distributionPlatform=darwin-aarch64 ;; + :Linux*x86_64*) distributionPlatform=linux-amd64 ;; + *) + echo "Cannot detect native platform for mvnd on $(uname)-$(uname -m), use pure java version" >&2 + distributionPlatform=linux-amd64 + ;; + esac + distributionUrl="${distributionUrl%-bin.*}-$distributionPlatform.zip" + ;; +maven-mvnd-*) MVN_CMD=mvnd.sh _MVNW_REPO_PATTERN=/maven/mvnd/ ;; +*) MVN_CMD="mvn${scriptName#mvnw}" _MVNW_REPO_PATTERN=/org/apache/maven/ ;; +esac + +# apply MVNW_REPOURL and calculate MAVEN_HOME +# maven home pattern: ~/.m2/wrapper/dists/{apache-maven-,maven-mvnd--}/ +[ -z "${MVNW_REPOURL-}" ] || distributionUrl="$MVNW_REPOURL$_MVNW_REPO_PATTERN${distributionUrl#*"$_MVNW_REPO_PATTERN"}" +distributionUrlName="${distributionUrl##*/}" +distributionUrlNameMain="${distributionUrlName%.*}" +distributionUrlNameMain="${distributionUrlNameMain%-bin}" +MAVEN_USER_HOME="${MAVEN_USER_HOME:-${HOME}/.m2}" +MAVEN_HOME="${MAVEN_USER_HOME}/wrapper/dists/${distributionUrlNameMain-}/$(hash_string "$distributionUrl")" + +exec_maven() { + unset MVNW_VERBOSE MVNW_USERNAME MVNW_PASSWORD MVNW_REPOURL || : + exec "$MAVEN_HOME/bin/$MVN_CMD" "$@" || die "cannot exec $MAVEN_HOME/bin/$MVN_CMD" +} + +if [ -d "$MAVEN_HOME" ]; then + verbose "found existing MAVEN_HOME at $MAVEN_HOME" + exec_maven "$@" +fi + +case "${distributionUrl-}" in +*?-bin.zip | *?maven-mvnd-?*-?*.zip) ;; +*) die "distributionUrl is not valid, must match *-bin.zip or maven-mvnd-*.zip, but found '${distributionUrl-}'" ;; +esac + +# prepare tmp dir +if TMP_DOWNLOAD_DIR="$(mktemp -d)" && [ -d "$TMP_DOWNLOAD_DIR" ]; then + clean() { rm -rf -- "$TMP_DOWNLOAD_DIR"; } + trap clean HUP INT TERM EXIT +else + die "cannot create temp dir" +fi + +mkdir -p -- "${MAVEN_HOME%/*}" + +# Download and Install Apache Maven +verbose "Couldn't find MAVEN_HOME, downloading and installing it ..." +verbose "Downloading from: $distributionUrl" +verbose "Downloading to: $TMP_DOWNLOAD_DIR/$distributionUrlName" + +# select .zip or .tar.gz +if ! command -v unzip >/dev/null; then + distributionUrl="${distributionUrl%.zip}.tar.gz" + distributionUrlName="${distributionUrl##*/}" +fi + +# verbose opt +__MVNW_QUIET_WGET=--quiet __MVNW_QUIET_CURL=--silent __MVNW_QUIET_UNZIP=-q __MVNW_QUIET_TAR='' +[ "${MVNW_VERBOSE-}" != true ] || __MVNW_QUIET_WGET='' __MVNW_QUIET_CURL='' __MVNW_QUIET_UNZIP='' __MVNW_QUIET_TAR=v + +# normalize http auth +case "${MVNW_PASSWORD:+has-password}" in +'') MVNW_USERNAME='' MVNW_PASSWORD='' ;; +has-password) [ -n "${MVNW_USERNAME-}" ] || MVNW_USERNAME='' MVNW_PASSWORD='' ;; +esac + +if [ -z "${MVNW_USERNAME-}" ] && command -v wget >/dev/null; then + verbose "Found wget ... using wget" + wget ${__MVNW_QUIET_WGET:+"$__MVNW_QUIET_WGET"} "$distributionUrl" -O "$TMP_DOWNLOAD_DIR/$distributionUrlName" || die "wget: Failed to fetch $distributionUrl" +elif [ -z "${MVNW_USERNAME-}" ] && command -v curl >/dev/null; then + verbose "Found curl ... using curl" + curl ${__MVNW_QUIET_CURL:+"$__MVNW_QUIET_CURL"} -f -L -o "$TMP_DOWNLOAD_DIR/$distributionUrlName" "$distributionUrl" || die "curl: Failed to fetch $distributionUrl" +elif set_java_home; then + verbose "Falling back to use Java to download" + javaSource="$TMP_DOWNLOAD_DIR/Downloader.java" + targetZip="$TMP_DOWNLOAD_DIR/$distributionUrlName" + cat >"$javaSource" <<-END + public class Downloader extends java.net.Authenticator + { + protected java.net.PasswordAuthentication getPasswordAuthentication() + { + return new java.net.PasswordAuthentication( System.getenv( "MVNW_USERNAME" ), System.getenv( "MVNW_PASSWORD" ).toCharArray() ); + } + public static void main( String[] args ) throws Exception + { + setDefault( new Downloader() ); + java.nio.file.Files.copy( java.net.URI.create( args[0] ).toURL().openStream(), java.nio.file.Paths.get( args[1] ).toAbsolutePath().normalize() ); + } + } + END + # For Cygwin/MinGW, switch paths to Windows format before running javac and java + verbose " - Compiling Downloader.java ..." + "$(native_path "$JAVACCMD")" "$(native_path "$javaSource")" || die "Failed to compile Downloader.java" + verbose " - Running Downloader.java ..." + "$(native_path "$JAVACMD")" -cp "$(native_path "$TMP_DOWNLOAD_DIR")" Downloader "$distributionUrl" "$(native_path "$targetZip")" +fi + +# If specified, validate the SHA-256 sum of the Maven distribution zip file +if [ -n "${distributionSha256Sum-}" ]; then + distributionSha256Result=false + if [ "$MVN_CMD" = mvnd.sh ]; then + echo "Checksum validation is not supported for maven-mvnd." >&2 + echo "Please disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." >&2 + exit 1 + elif command -v sha256sum >/dev/null; then + if echo "$distributionSha256Sum $TMP_DOWNLOAD_DIR/$distributionUrlName" | sha256sum -c - >/dev/null 2>&1; then + distributionSha256Result=true + fi + elif command -v shasum >/dev/null; then + if echo "$distributionSha256Sum $TMP_DOWNLOAD_DIR/$distributionUrlName" | shasum -a 256 -c >/dev/null 2>&1; then + distributionSha256Result=true + fi + else + echo "Checksum validation was requested but neither 'sha256sum' or 'shasum' are available." >&2 + echo "Please install either command, or disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." >&2 + exit 1 + fi + if [ $distributionSha256Result = false ]; then + echo "Error: Failed to validate Maven distribution SHA-256, your Maven distribution might be compromised." >&2 + echo "If you updated your Maven version, you need to update the specified distributionSha256Sum property." >&2 + exit 1 + fi +fi + +# unzip and move +if command -v unzip >/dev/null; then + unzip ${__MVNW_QUIET_UNZIP:+"$__MVNW_QUIET_UNZIP"} "$TMP_DOWNLOAD_DIR/$distributionUrlName" -d "$TMP_DOWNLOAD_DIR" || die "failed to unzip" +else + tar xzf${__MVNW_QUIET_TAR:+"$__MVNW_QUIET_TAR"} "$TMP_DOWNLOAD_DIR/$distributionUrlName" -C "$TMP_DOWNLOAD_DIR" || die "failed to untar" +fi + +# Find the actual extracted directory name (handles snapshots where filename != directory name) +actualDistributionDir="" + +# First try the expected directory name (for regular distributions) +if [ -d "$TMP_DOWNLOAD_DIR/$distributionUrlNameMain" ]; then + if [ -f "$TMP_DOWNLOAD_DIR/$distributionUrlNameMain/bin/$MVN_CMD" ]; then + actualDistributionDir="$distributionUrlNameMain" + fi +fi + +# If not found, search for any directory with the Maven executable (for snapshots) +if [ -z "$actualDistributionDir" ]; then + # enable globbing to iterate over items + set +f + for dir in "$TMP_DOWNLOAD_DIR"/*; do + if [ -d "$dir" ]; then + if [ -f "$dir/bin/$MVN_CMD" ]; then + actualDistributionDir="$(basename "$dir")" + break + fi + fi + done + set -f +fi + +if [ -z "$actualDistributionDir" ]; then + verbose "Contents of $TMP_DOWNLOAD_DIR:" + verbose "$(ls -la "$TMP_DOWNLOAD_DIR")" + die "Could not find Maven distribution directory in extracted archive" +fi + +verbose "Found extracted Maven distribution directory: $actualDistributionDir" +printf %s\\n "$distributionUrl" >"$TMP_DOWNLOAD_DIR/$actualDistributionDir/mvnw.url" +mv -- "$TMP_DOWNLOAD_DIR/$actualDistributionDir" "$MAVEN_HOME" || [ -d "$MAVEN_HOME" ] || die "fail to move MAVEN_HOME" + +clean || : +exec_maven "$@" diff --git a/mvnw.cmd b/mvnw.cmd new file mode 100644 index 0000000..92450f9 --- /dev/null +++ b/mvnw.cmd @@ -0,0 +1,189 @@ +<# : batch portion +@REM ---------------------------------------------------------------------------- +@REM Licensed to the Apache Software Foundation (ASF) under one +@REM or more contributor license agreements. See the NOTICE file +@REM distributed with this work for additional information +@REM regarding copyright ownership. The ASF licenses this file +@REM to you under the Apache License, Version 2.0 (the +@REM "License"); you may not use this file except in compliance +@REM with the License. You may obtain a copy of the License at +@REM +@REM http://www.apache.org/licenses/LICENSE-2.0 +@REM +@REM Unless required by applicable law or agreed to in writing, +@REM software distributed under the License is distributed on an +@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +@REM KIND, either express or implied. See the License for the +@REM specific language governing permissions and limitations +@REM under the License. +@REM ---------------------------------------------------------------------------- + +@REM ---------------------------------------------------------------------------- +@REM Apache Maven Wrapper startup batch script, version 3.3.4 +@REM +@REM Optional ENV vars +@REM MVNW_REPOURL - repo url base for downloading maven distribution +@REM MVNW_USERNAME/MVNW_PASSWORD - user and password for downloading maven +@REM MVNW_VERBOSE - true: enable verbose log; others: silence the output +@REM ---------------------------------------------------------------------------- + +@IF "%__MVNW_ARG0_NAME__%"=="" (SET __MVNW_ARG0_NAME__=%~nx0) +@SET __MVNW_CMD__= +@SET __MVNW_ERROR__= +@SET __MVNW_PSMODULEP_SAVE=%PSModulePath% +@SET PSModulePath= +@FOR /F "usebackq tokens=1* delims==" %%A IN (`powershell -noprofile "& {$scriptDir='%~dp0'; $script='%__MVNW_ARG0_NAME__%'; icm -ScriptBlock ([Scriptblock]::Create((Get-Content -Raw '%~f0'))) -NoNewScope}"`) DO @( + IF "%%A"=="MVN_CMD" (set __MVNW_CMD__=%%B) ELSE IF "%%B"=="" (echo %%A) ELSE (echo %%A=%%B) +) +@SET PSModulePath=%__MVNW_PSMODULEP_SAVE% +@SET __MVNW_PSMODULEP_SAVE= +@SET __MVNW_ARG0_NAME__= +@SET MVNW_USERNAME= +@SET MVNW_PASSWORD= +@IF NOT "%__MVNW_CMD__%"=="" ("%__MVNW_CMD__%" %*) +@echo Cannot start maven from wrapper >&2 && exit /b 1 +@GOTO :EOF +: end batch / begin powershell #> + +$ErrorActionPreference = "Stop" +if ($env:MVNW_VERBOSE -eq "true") { + $VerbosePreference = "Continue" +} + +# calculate distributionUrl, requires .mvn/wrapper/maven-wrapper.properties +$distributionUrl = (Get-Content -Raw "$scriptDir/.mvn/wrapper/maven-wrapper.properties" | ConvertFrom-StringData).distributionUrl +if (!$distributionUrl) { + Write-Error "cannot read distributionUrl property in $scriptDir/.mvn/wrapper/maven-wrapper.properties" +} + +switch -wildcard -casesensitive ( $($distributionUrl -replace '^.*/','') ) { + "maven-mvnd-*" { + $USE_MVND = $true + $distributionUrl = $distributionUrl -replace '-bin\.[^.]*$',"-windows-amd64.zip" + $MVN_CMD = "mvnd.cmd" + break + } + default { + $USE_MVND = $false + $MVN_CMD = $script -replace '^mvnw','mvn' + break + } +} + +# apply MVNW_REPOURL and calculate MAVEN_HOME +# maven home pattern: ~/.m2/wrapper/dists/{apache-maven-,maven-mvnd--}/ +if ($env:MVNW_REPOURL) { + $MVNW_REPO_PATTERN = if ($USE_MVND -eq $False) { "/org/apache/maven/" } else { "/maven/mvnd/" } + $distributionUrl = "$env:MVNW_REPOURL$MVNW_REPO_PATTERN$($distributionUrl -replace "^.*$MVNW_REPO_PATTERN",'')" +} +$distributionUrlName = $distributionUrl -replace '^.*/','' +$distributionUrlNameMain = $distributionUrlName -replace '\.[^.]*$','' -replace '-bin$','' + +$MAVEN_M2_PATH = "$HOME/.m2" +if ($env:MAVEN_USER_HOME) { + $MAVEN_M2_PATH = "$env:MAVEN_USER_HOME" +} + +if (-not (Test-Path -Path $MAVEN_M2_PATH)) { + New-Item -Path $MAVEN_M2_PATH -ItemType Directory | Out-Null +} + +$MAVEN_WRAPPER_DISTS = $null +if ((Get-Item $MAVEN_M2_PATH).Target[0] -eq $null) { + $MAVEN_WRAPPER_DISTS = "$MAVEN_M2_PATH/wrapper/dists" +} else { + $MAVEN_WRAPPER_DISTS = (Get-Item $MAVEN_M2_PATH).Target[0] + "/wrapper/dists" +} + +$MAVEN_HOME_PARENT = "$MAVEN_WRAPPER_DISTS/$distributionUrlNameMain" +$MAVEN_HOME_NAME = ([System.Security.Cryptography.SHA256]::Create().ComputeHash([byte[]][char[]]$distributionUrl) | ForEach-Object {$_.ToString("x2")}) -join '' +$MAVEN_HOME = "$MAVEN_HOME_PARENT/$MAVEN_HOME_NAME" + +if (Test-Path -Path "$MAVEN_HOME" -PathType Container) { + Write-Verbose "found existing MAVEN_HOME at $MAVEN_HOME" + Write-Output "MVN_CMD=$MAVEN_HOME/bin/$MVN_CMD" + exit $? +} + +if (! $distributionUrlNameMain -or ($distributionUrlName -eq $distributionUrlNameMain)) { + Write-Error "distributionUrl is not valid, must end with *-bin.zip, but found $distributionUrl" +} + +# prepare tmp dir +$TMP_DOWNLOAD_DIR_HOLDER = New-TemporaryFile +$TMP_DOWNLOAD_DIR = New-Item -Itemtype Directory -Path "$TMP_DOWNLOAD_DIR_HOLDER.dir" +$TMP_DOWNLOAD_DIR_HOLDER.Delete() | Out-Null +trap { + if ($TMP_DOWNLOAD_DIR.Exists) { + try { Remove-Item $TMP_DOWNLOAD_DIR -Recurse -Force | Out-Null } + catch { Write-Warning "Cannot remove $TMP_DOWNLOAD_DIR" } + } +} + +New-Item -Itemtype Directory -Path "$MAVEN_HOME_PARENT" -Force | Out-Null + +# Download and Install Apache Maven +Write-Verbose "Couldn't find MAVEN_HOME, downloading and installing it ..." +Write-Verbose "Downloading from: $distributionUrl" +Write-Verbose "Downloading to: $TMP_DOWNLOAD_DIR/$distributionUrlName" + +$webclient = New-Object System.Net.WebClient +if ($env:MVNW_USERNAME -and $env:MVNW_PASSWORD) { + $webclient.Credentials = New-Object System.Net.NetworkCredential($env:MVNW_USERNAME, $env:MVNW_PASSWORD) +} +[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 +$webclient.DownloadFile($distributionUrl, "$TMP_DOWNLOAD_DIR/$distributionUrlName") | Out-Null + +# If specified, validate the SHA-256 sum of the Maven distribution zip file +$distributionSha256Sum = (Get-Content -Raw "$scriptDir/.mvn/wrapper/maven-wrapper.properties" | ConvertFrom-StringData).distributionSha256Sum +if ($distributionSha256Sum) { + if ($USE_MVND) { + Write-Error "Checksum validation is not supported for maven-mvnd. `nPlease disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." + } + Import-Module $PSHOME\Modules\Microsoft.PowerShell.Utility -Function Get-FileHash + if ((Get-FileHash "$TMP_DOWNLOAD_DIR/$distributionUrlName" -Algorithm SHA256).Hash.ToLower() -ne $distributionSha256Sum) { + Write-Error "Error: Failed to validate Maven distribution SHA-256, your Maven distribution might be compromised. If you updated your Maven version, you need to update the specified distributionSha256Sum property." + } +} + +# unzip and move +Expand-Archive "$TMP_DOWNLOAD_DIR/$distributionUrlName" -DestinationPath "$TMP_DOWNLOAD_DIR" | Out-Null + +# Find the actual extracted directory name (handles snapshots where filename != directory name) +$actualDistributionDir = "" + +# First try the expected directory name (for regular distributions) +$expectedPath = Join-Path "$TMP_DOWNLOAD_DIR" "$distributionUrlNameMain" +$expectedMvnPath = Join-Path "$expectedPath" "bin/$MVN_CMD" +if ((Test-Path -Path $expectedPath -PathType Container) -and (Test-Path -Path $expectedMvnPath -PathType Leaf)) { + $actualDistributionDir = $distributionUrlNameMain +} + +# If not found, search for any directory with the Maven executable (for snapshots) +if (!$actualDistributionDir) { + Get-ChildItem -Path "$TMP_DOWNLOAD_DIR" -Directory | ForEach-Object { + $testPath = Join-Path $_.FullName "bin/$MVN_CMD" + if (Test-Path -Path $testPath -PathType Leaf) { + $actualDistributionDir = $_.Name + } + } +} + +if (!$actualDistributionDir) { + Write-Error "Could not find Maven distribution directory in extracted archive" +} + +Write-Verbose "Found extracted Maven distribution directory: $actualDistributionDir" +Rename-Item -Path "$TMP_DOWNLOAD_DIR/$actualDistributionDir" -NewName $MAVEN_HOME_NAME | Out-Null +try { + Move-Item -Path "$TMP_DOWNLOAD_DIR/$MAVEN_HOME_NAME" -Destination $MAVEN_HOME_PARENT | Out-Null +} catch { + if (! (Test-Path -Path "$MAVEN_HOME" -PathType Container)) { + Write-Error "fail to move MAVEN_HOME" + } +} finally { + try { Remove-Item $TMP_DOWNLOAD_DIR -Recurse -Force | Out-Null } + catch { Write-Warning "Cannot remove $TMP_DOWNLOAD_DIR" } +} + +Write-Output "MVN_CMD=$MAVEN_HOME/bin/$MVN_CMD" diff --git a/pom.xml b/pom.xml new file mode 100644 index 0000000..6a646d6 --- /dev/null +++ b/pom.xml @@ -0,0 +1,73 @@ + + + 4.0.0 + + org.springframework.boot + spring-boot-starter-parent + 4.1.1 + + + ir.peeco. + callback + 0.0.1-SNAPSHOT + + + + + + + + + + + + + + + + + 17 + + + + org.springframework.boot + spring-boot-starter-jdbc + + + org.springframework.boot + spring-boot-starter-data-jpa + + + org.postgresql + postgresql + runtime + + + org.projectlombok + lombok + true + + + com.h2database + h2 + test + + + + org.springframework.boot + spring-boot-starter-test + test + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + + diff --git a/scripts/callback-agi b/scripts/callback-agi new file mode 100755 index 0000000..48210b1 --- /dev/null +++ b/scripts/callback-agi @@ -0,0 +1,13 @@ +#!/bin/sh +set -eu + +SCRIPT_DIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd) +JAR_PATH="${CALLBACK_AGI_JAR:-$SCRIPT_DIR/../target/callback-0.0.1-SNAPSHOT.jar}" + +if [ ! -f "$JAR_PATH" ]; then + echo "Callback AGI JAR not found: $JAR_PATH" >&2 + echo "Set CALLBACK_AGI_JAR to the absolute path of the packaged JAR." >&2 + exit 1 +fi + +exec java -jar "$JAR_PATH" diff --git a/src/main/java/ir/peeco/callback/CallbackApplication.java b/src/main/java/ir/peeco/callback/CallbackApplication.java new file mode 100644 index 0000000..4412e97 --- /dev/null +++ b/src/main/java/ir/peeco/callback/CallbackApplication.java @@ -0,0 +1,16 @@ +package ir.peeco.callback; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.boot.Banner; + +@SpringBootApplication +public class CallbackApplication { + + public static void main(String[] args) { + SpringApplication application = new SpringApplication(CallbackApplication.class); + application.setBannerMode(Banner.Mode.OFF); + application.run(args); + } + +} diff --git a/src/main/java/ir/peeco/callback/agi/CallbackAgi.java b/src/main/java/ir/peeco/callback/agi/CallbackAgi.java new file mode 100644 index 0000000..da9aaa8 --- /dev/null +++ b/src/main/java/ir/peeco/callback/agi/CallbackAgi.java @@ -0,0 +1,122 @@ +package ir.peeco.callback.agi; + +import ir.peeco.callback.service.CallbackCandidate; +import ir.peeco.callback.service.CallbackService; +import ir.peeco.callback.service.PhoneNumberNormalizer; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.CommandLineRunner; +import org.springframework.dao.DataAccessException; +import org.springframework.stereotype.Component; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.io.BufferedReader; +import java.io.BufferedWriter; +import java.io.IOException; +import java.io.InputStreamReader; +import java.io.OutputStreamWriter; +import java.util.HashMap; +import java.util.Map; + +@Component +public class CallbackAgi implements CommandLineRunner { + private static final Logger LOGGER = LoggerFactory.getLogger(CallbackAgi.class); + private final CallbackService callbackService; + private final String dialPrefix; + private final int dialTimeoutSeconds; + private final String ivrContext; + private final String ivrExtension; + private final int ivrPriority; + private final boolean enabled; + + public CallbackAgi( + CallbackService callbackService, + @Value("${callback.agi.dial-prefix:PJSIP/}") String dialPrefix, + @Value("${callback.agi.dial-timeout-seconds:20}") int dialTimeoutSeconds, + @Value("${callback.agi.ivr-context:from-trunk}") String ivrContext, + @Value("${callback.agi.ivr-extension:s}") String ivrExtension, + @Value("${callback.agi.ivr-priority:1}") int ivrPriority, + @Value("${callback.agi.enabled:true}") boolean enabled) { + this.callbackService = callbackService; + this.dialPrefix = dialPrefix; + this.dialTimeoutSeconds = dialTimeoutSeconds; + this.ivrContext = ivrContext; + this.ivrExtension = ivrExtension; + this.ivrPriority = ivrPriority; + this.enabled = enabled; + } + + @Override + public void run(String... args) throws Exception { + execute(System.in, System.out); + } + + void execute(java.io.InputStream input, java.io.OutputStream output) throws IOException { + BufferedReader reader = new BufferedReader(new InputStreamReader(input)); + BufferedWriter writer = new BufferedWriter(new OutputStreamWriter(output)); + Map environment = readEnvironment(reader); + String customerNumber = PhoneNumberNormalizer.normalize(environment.get("agi_callerid")); + + if (customerNumber.isEmpty()) { + gotoIvr(writer, reader); + return; + } + + if (!enabled) { + gotoIvr(writer, reader); + return; + } + + CallbackCandidate candidate; + try { + candidate = callbackService.claim(customerNumber).orElse(null); + } catch (DataAccessException exception) { + LOGGER.error("Callback lookup failed; continuing to the IVR", exception); + gotoIvr(writer, reader); + return; + } + if (candidate == null || candidate.src() == null || candidate.src().isBlank()) { + gotoIvr(writer, reader); + return; + } + + command(writer, reader, + "EXEC Dial " + dialPrefix + candidate.src() + "," + dialTimeoutSeconds); + String dialStatus = command(writer, reader, "GET VARIABLE DIALSTATUS"); + if (dialAnswered(dialStatus)) { + callbackService.markDone(candidate.id()); + } else { + callbackService.release(candidate.id()); + gotoIvr(writer, reader); + } + } + + private Map readEnvironment(BufferedReader reader) throws IOException { + Map environment = new HashMap<>(); + String line; + while ((line = reader.readLine()) != null && !line.isEmpty()) { + int separator = line.indexOf(':'); + if (separator > 0) { + environment.put(line.substring(0, separator), line.substring(separator + 1).trim()); + } + } + return environment; + } + + private void gotoIvr(BufferedWriter writer, BufferedReader reader) throws IOException { + command(writer, reader, "EXEC Goto " + ivrContext + "," + ivrExtension + "," + ivrPriority); + } + + private String command(BufferedWriter writer, BufferedReader reader, String value) throws IOException { + writer.write(value); + writer.newLine(); + writer.flush(); + String response = reader.readLine(); + return response == null ? "" : response; + } + + private boolean dialAnswered(String result) { + return result.contains("ANSWER"); + } + +} diff --git a/src/main/java/ir/peeco/callback/model/TblCdr.java b/src/main/java/ir/peeco/callback/model/TblCdr.java new file mode 100644 index 0000000..d4b711f --- /dev/null +++ b/src/main/java/ir/peeco/callback/model/TblCdr.java @@ -0,0 +1,73 @@ +package ir.peeco.callback.model; + +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.Index; +import jakarta.persistence.Table; +import lombok.Data; + +import java.sql.Timestamp; + +@Data +@Entity(name = "tbl_cdr") +@Table(name = "tbl_cdr", indexes = { + @Index(name = "dst_src_real_index", columnList = "dst,src,real_dst,uniqueid") +}) +public class TblCdr { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @Column(nullable = false, columnDefinition = "timestamp WITH TIME ZONE") + private Timestamp calldate; + + @Column(nullable = false) + private String clid; + @Column(nullable = false) + private String src; + @Column(nullable = false) + private String dst; + @Column(nullable = false) + private String dcontext; + @Column(nullable = false) + private String channel; + @Column(nullable = false) + private String dstchannel; + @Column(nullable = false) + private String lastapp; + @Column(nullable = false) + private String lastdata; + @Column(nullable = false) + private long duration; + @Column(nullable = false) + private long billsec; + @Column(nullable = false) + private String disposition; + @Column(nullable = false) + private long amaflags; + @Column(nullable = false) + private String accountcode; + @Column(nullable = false) + private String uniqueid; + @Column(nullable = false) + private String peeraccount; + @Column(nullable = false) + private String linkedid; + @Column(nullable = false) + private long sequence; + @Column(nullable = false) + private String userfield; + @Column(nullable = false, columnDefinition = "varchar(255) default ''") + private String real_dst; + @Column(nullable = false, columnDefinition = "varchar(255) default ''") + private String call_on_trunk; + @Column(nullable = false, columnDefinition = "varchar(1) default 'n'") + private String do_record_file = "n"; + private String target; + private String direction_call; + private String target_name; +} diff --git a/src/main/java/ir/peeco/callback/service/CallbackCandidate.java b/src/main/java/ir/peeco/callback/service/CallbackCandidate.java new file mode 100644 index 0000000..0b7072a --- /dev/null +++ b/src/main/java/ir/peeco/callback/service/CallbackCandidate.java @@ -0,0 +1,6 @@ +package ir.peeco.callback.service; + +import java.sql.Timestamp; + +public record CallbackCandidate(long id, String src, Timestamp calldate, String disposition) { +} diff --git a/src/main/java/ir/peeco/callback/service/CallbackService.java b/src/main/java/ir/peeco/callback/service/CallbackService.java new file mode 100644 index 0000000..2dc5a1f --- /dev/null +++ b/src/main/java/ir/peeco/callback/service/CallbackService.java @@ -0,0 +1,85 @@ +package ir.peeco.callback.service; + +import org.springframework.jdbc.core.JdbcTemplate; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; +import java.util.Optional; + +@Service +public class CallbackService { + private static final String FIND_CANDIDATE = """ + SELECT id, src, calldate, disposition + FROM tbl_cdr + WHERE real_dst = ? + AND direction_call = 'outbound' + AND disposition IN ('NO ANSWER', 'BUSY', 'FAILED') + AND calldate >= NOW() - (? * INTERVAL '1 minute') + AND (target IS NULL OR target = '') + AND NOT EXISTS ( + SELECT 1 + FROM tbl_cdr completed + WHERE completed.real_dst = tbl_cdr.real_dst + AND completed.direction_call = 'outbound' + AND completed.target = ? + ) + ORDER BY calldate DESC + LIMIT 1 + """; + + private final JdbcTemplate jdbcTemplate; + private final String claimValue; + private final String doneValue; + private final int lookbackMinutes; + + public CallbackService( + JdbcTemplate jdbcTemplate, + @Value("${callback.agi.claim-value:pending}") String claimValue, + @Value("${callback.agi.done-value:callback_done}") String doneValue, + @Value("${callback.agi.lookback-minutes:60}") int lookbackMinutes) { + this.jdbcTemplate = jdbcTemplate; + this.claimValue = claimValue; + this.doneValue = doneValue; + if (lookbackMinutes <= 0) { + throw new IllegalArgumentException("callback.agi.lookback-minutes must be greater than zero"); + } + this.lookbackMinutes = lookbackMinutes; + } + + @Transactional + public Optional claim(String customerNumber) { + List candidates = jdbcTemplate.query( + FIND_CANDIDATE, + (rs, rowNum) -> new CallbackCandidate( + rs.getLong("id"), + rs.getString("src"), + rs.getTimestamp("calldate"), + rs.getString("disposition")), + lookbackMinutes, customerNumber, doneValue); + + if (candidates.isEmpty()) { + return Optional.empty(); + } + + CallbackCandidate candidate = candidates.get(0); + int claimed = jdbcTemplate.update(""" + UPDATE tbl_cdr + SET target = ?, target_name = ? + WHERE id = ? + AND (target IS NULL OR target = '') + """, claimValue, candidate.src(), candidate.id()); + return claimed == 1 ? Optional.of(candidate) : Optional.empty(); + } + + public void markDone(long id) { + jdbcTemplate.update("UPDATE tbl_cdr SET target = ? WHERE id = ? AND target = ?", + doneValue, id, claimValue); + } + + public void release(long id) { + jdbcTemplate.update("UPDATE tbl_cdr SET target = NULL WHERE id = ? AND target = ?", + id, claimValue); + } +} diff --git a/src/main/java/ir/peeco/callback/service/PhoneNumberNormalizer.java b/src/main/java/ir/peeco/callback/service/PhoneNumberNormalizer.java new file mode 100644 index 0000000..b815e79 --- /dev/null +++ b/src/main/java/ir/peeco/callback/service/PhoneNumberNormalizer.java @@ -0,0 +1,27 @@ +package ir.peeco.callback.service; + +import java.util.regex.Pattern; + +public final class PhoneNumberNormalizer { + private static final Pattern SEPARATORS = Pattern.compile("[\\s-]"); + + private PhoneNumberNormalizer() { + } + + public static String normalize(String value) { + if (value == null) { + return ""; + } + String number = SEPARATORS.matcher(value.trim()).replaceAll(""); + if (number.startsWith("+98")) { + return number.substring(3); + } + if (number.startsWith("0098")) { + return number.substring(4); + } + if (number.startsWith("0") && number.length() > 1) { + return number.substring(1); + } + return number; + } +} diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties new file mode 100644 index 0000000..96f829d --- /dev/null +++ b/src/main/resources/application.properties @@ -0,0 +1,27 @@ +spring.application.name=callback +spring.main.web-application-type=none +debug=false +logging.level.root=INFO +logging.level.org.springframework=INFO +logging.level.org.hibernate=INFO +logging.level.com.zaxxer.hikari=INFO + +spring.datasource.url=jdbc:postgresql://127.0.0.1:5432/pline +spring.datasource.username=root +spring.datasource.password=Mehdi@123 +spring.datasource.hikari.maximum-pool-size=5 +spring.datasource.hikari.connection-timeout=1500 +spring.jpa.hibernate.ddl-auto=none +spring.jpa.open-in-view=false +spring.jpa.properties.hibernate.jdbc.time_zone=UTC + +callback.agi.dial-prefix=PJSIP/ +callback.agi.dial-timeout-seconds=45 +callback.agi.ivr-context=from-trunk +callback.agi.ivr-extension=s +callback.agi.ivr-priority=1 + +callback.agi.enabled=true +callback.agi.lookback-minutes=60 +callback.agi.claim-value=pending +callback.agi.done-value=callback_done diff --git a/src/main/resources/logback-spring.xml b/src/main/resources/logback-spring.xml new file mode 100644 index 0000000..00154fb --- /dev/null +++ b/src/main/resources/logback-spring.xml @@ -0,0 +1,12 @@ + + + System.err + + %d{yyyy-MM-dd HH:mm:ss.SSS} %-5level [%thread] %logger{36} - %msg%n + + + + + + + diff --git a/src/test/java/ir/peeco/callback/CallbackApplicationTests.java b/src/test/java/ir/peeco/callback/CallbackApplicationTests.java new file mode 100644 index 0000000..6a9a304 --- /dev/null +++ b/src/test/java/ir/peeco/callback/CallbackApplicationTests.java @@ -0,0 +1,13 @@ +package ir.peeco.callback; + +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.context.SpringBootTest; + +@SpringBootTest +class CallbackApplicationTests { + + @Test + void contextLoads() { + } + +} diff --git a/src/test/java/ir/peeco/callback/PhoneNumberNormalizerTests.java b/src/test/java/ir/peeco/callback/PhoneNumberNormalizerTests.java new file mode 100644 index 0000000..4649eb0 --- /dev/null +++ b/src/test/java/ir/peeco/callback/PhoneNumberNormalizerTests.java @@ -0,0 +1,15 @@ +package ir.peeco.callback; + +import ir.peeco.callback.service.PhoneNumberNormalizer; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertEquals; + +class PhoneNumberNormalizerTests { + @Test + void removesIranianPrefixesAndSeparators() { + assertEquals("9121234567", PhoneNumberNormalizer.normalize("+98 912-123-4567")); + assertEquals("9121234567", PhoneNumberNormalizer.normalize("00989121234567")); + assertEquals("9121234567", PhoneNumberNormalizer.normalize("09121234567")); + } +} diff --git a/src/test/resources/application.properties b/src/test/resources/application.properties new file mode 100644 index 0000000..b056461 --- /dev/null +++ b/src/test/resources/application.properties @@ -0,0 +1,7 @@ +spring.datasource.url=jdbc:h2:mem:callback;MODE=PostgreSQL;DB_CLOSE_DELAY=-1 +spring.datasource.username=sa +spring.datasource.password= +spring.jpa.hibernate.ddl-auto=none +spring.jpa.database-platform=org.hibernate.dialect.H2Dialect +callback.agi.enabled=false +callback.agi.lookback-minutes=60